Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql	(revision b6205d31d12d02cf200fecd04974f56e4f4041da)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+--LDEV-5002 Add question Etherpads
+
+ALTER TABLE tl_laasse10_assessment ADD COLUMN question_etherpad_enabled TINYINT(1) DEFAULT 0 AFTER use_select_leader_tool_ouput;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -rb6205d31d12d02cf200fecd04974f56e4f4041da
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision b6205d31d12d02cf200fecd04974f56e4f4041da)
@@ -133,6 +133,9 @@
     @Column(name = "reflect_instructions")
     private String reflectInstructions;
 
+    @Column(name = "question_etherpad_enabled")
+    private boolean questionEtherpadEnabled;
+
     // general information
     
     @Column(name = "create_date")
@@ -634,4 +637,12 @@
     public void setReflectOnActivity(boolean reflectOnActivity) {
 	this.reflectOnActivity = reflectOnActivity;
     }
+
+    public boolean isQuestionEtherpadEnabled() {
+	return questionEtherpadEnabled;
+    }
+
+    public void setQuestionEtherpadEnabled(boolean questionEtherpadEnabled) {
+	this.questionEtherpadEnabled = questionEtherpadEnabled;
+    }
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -ra8bfd33aa6963608e01ba5f7015031686ab113ae -rb6205d31d12d02cf200fecd04974f56e4f4041da
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision a8bfd33aa6963608e01ba5f7015031686ab113ae)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision b6205d31d12d02cf200fecd04974f56e4f4041da)
@@ -362,7 +362,9 @@
 		service.setAttemptStarted(assessment, user, toolSessionId);
 	    }
 
+	    // display Etherpads after each question
 	    boolean questionEtherpadEnabled = assessment.isUseSelectLeaderToolOuput()
+		    && assessment.isQuestionEtherpadEnabled()
 		    && StringUtils.isNotBlank(Configuration.get(ConfigurationKeys.ETHERPAD_API_KEY));
 	    request.setAttribute(AssessmentConstants.ATTR_IS_QUESTION_ETHERPAD_ENABLED, questionEtherpadEnabled);
 	    if (questionEtherpadEnabled) {
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r80821e9537b4e30c38b9ca656076f09d9bcbf316 -rb6205d31d12d02cf200fecd04974f56e4f4041da
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 80821e9537b4e30c38b9ca656076f09d9bcbf316)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b6205d31d12d02cf200fecd04974f56e4f4041da)
@@ -34,11 +34,11 @@
 		$("#useSelectLeaderToolOuput").change(function() {
 			if ($(this).prop('checked')) {
 				$("#display-summary").prop("checked", true).prop("disabled", true);
-				$('#display-summary-area').show('slow');
-				$('#allowDiscloseAnswers').prop('disabled', false);
+				$('#display-summary-area, #questionEtherpadEnabled').show('slow');
+				$('#allowDiscloseAnswers, #questionEtherpadEnabled').prop('disabled', false);
 			} else {
 				$("#display-summary").prop("disabled", false);
-				$('#allowDiscloseAnswers').prop("checked", false).prop('disabled', true).change();
+				$('#allowDiscloseAnswers, #questionEtherpadEnabled').prop("checked", false).prop('disabled', true).change();
 			}		
 		});
 		
@@ -195,6 +195,13 @@
 	</div>
 </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>
+	
 <div class="checkbox">
 	<label for="allowOverallFeedbackAfterQuestion">
 		<form:checkbox path="assessment.allowOverallFeedbackAfterQuestion" id="allowOverallFeedbackAfterQuestion"/>