Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -rf91a13ebf9fee21e228d82128ed50511ef8b4169 -rbcbb7535afbed8b0c8bef17e309fd431ae77ec08
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision f91a13ebf9fee21e228d82128ed50511ef8b4169)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision bcbb7535afbed8b0c8bef17e309fd431ae77ec08)
@@ -5,18 +5,18 @@
 	$(document).ready(function(){
 		$("#attemptsAllowedRadio").click(function() {
 			$("#passingMark").val("0");
-			$("#passingMark").attr("disabled", "disabled");
-			$("#attemptsAllowed").attr("disabled", "");
+			$("#passingMark").prop("disabled", true);
+			$("#attemptsAllowed").prop("disabled", false);
 		});
 		
 		$("#passingMarkRadio").click(function() {
 			$("#attemptsAllowed").val("0");
-			$("#attemptsAllowed").attr("disabled", "disabled");
-			$("#passingMark").attr("disabled", "");
+			$("#attemptsAllowed").prop("disabled", true);
+			$("#passingMark").prop("disabled", false);
 		});
 		
-		<c:if test="${formBean.assessment.passingMark == 0}">$("#passingMark").attr("disabled", "disabled");</c:if>
-		<c:if test="${formBean.assessment.passingMark > 0}">$("#attemptsAllowed").attr("disabled", "disabled");</c:if>
+		<c:if test="${formBean.assessment.passingMark == 0}">$("#passingMark").prop("disabled", true);</c:if>
+		<c:if test="${formBean.assessment.passingMark > 0}">$("#attemptsAllowed").prop("disabled", true);</c:if>
 	});
 
 </script>
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -rfb10906fb7b35d813643db3f60a0b005163196f7 -rbcbb7535afbed8b0c8bef17e309fd431ae77ec08
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision fb10906fb7b35d813643db3f60a0b005163196f7)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision bcbb7535afbed8b0c8bef17e309fd431ae77ec08)
@@ -145,7 +145,7 @@
 		
 		for (var i = 1; i<=maxGrade; i++) {
 			var isSelected = (oldValue == i);
-		    $('#passingMark').append( new Option(i,i,isSelected) );
+		    $('#passingMark').append( new Option(i, i, isSelected, isSelected) );
 		}
 	};