Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -rc65b958157adea45182f01b500d7be72b7cb35fb -r14d9f83b40f3508ecb51d7242b0b2691997e56c6
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision c65b958157adea45182f01b500d7be72b7cb35fb)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 14d9f83b40f3508ecb51d7242b0b2691997e56c6)
@@ -3,8 +3,6 @@
 
 <script lang="javascript">
 	$(document).ready(function(){
-		$('#questionEtherpadEnabled').prop('disabled', ${!assessmentForm.assessment.useSelectLeaderToolOuput});
-		
 		$("#attemptsAllowedRadio").change(function() {
 			$("#passingMark").val("0");
 			$("#passingMark").prop("disabled", true);
@@ -39,10 +37,12 @@
 			if ($(this).prop('checked')) {
 				$("#display-summary").prop("checked", true).prop("disabled", true);
 				$('#display-summary-area').show('slow');
-				$('#allowDiscloseAnswers, #questionEtherpadEnabled').prop('disabled', false);
+				$('#questionEtherpadEnabled').closest('.checkbox').show('slow');
+				$('#allowDiscloseAnswers').prop('disabled', false);
 			} else {
 				$("#display-summary").prop("disabled", false);
-				$('#allowDiscloseAnswers, #questionEtherpadEnabled').prop("checked", false).prop('disabled', true).change();
+				$('#questionEtherpadEnabled').prop("checked", false).closest('.checkbox').hide('slow');
+				$('#allowDiscloseAnswers').prop("checked", false).prop('disabled', true).change();
 			}		
 		});
 
@@ -72,6 +72,13 @@
 		<fmt:message key="label.use.select.leader.tool.output" />
 	</label>
 </div>
+
+<div class="checkbox" <c:if test="${!assessmentForm.assessment.useSelectLeaderToolOuput}">style="display:none;"</c:if>>
+	<label for="questionEtherpadEnabled">
+		<form:checkbox path="assessment.questionEtherpadEnabled" id="questionEtherpadEnabled"/>
+		<fmt:message key="label.authoring.advance.question.etherpad" />
+	</label>
+</div>
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.question.options">
@@ -208,13 +215,6 @@
 </div>
 
 <div class="checkbox">
-	<label for="questionEtherpadEnabled">
-		<form:checkbox path="assessment.questionEtherpadEnabled" id="questionEtherpadEnabled" />
-		<fmt:message key="label.authoring.advance.question.etherpad" />
-	</label>
-</div>
-	
-<div class="checkbox">
 	<label for="allowOverallFeedbackAfterQuestion">
 		<form:checkbox path="assessment.allowOverallFeedbackAfterQuestion" id="allowOverallFeedbackAfterQuestion"/>
 		<fmt:message key="label.authoring.advance.allow.students.overall.feedback" />