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 ce97cec9b77669b1a07fe59949d2bd4d0aa3f901)
@@ -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 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 -rce97cec9b77669b1a07fe59949d2bd4d0aa3f901
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision ce97cec9b77669b1a07fe59949d2bd4d0aa3f901)
@@ -138,6 +138,9 @@
     @Column(name = "reflect_instructions")
     private String reflectInstructions;
 
+    @Column(name = "question_etherpad_enabled")
+    private boolean questionEtherpadEnabled;
+
     // general information
 
     @Column(name = "create_date")
@@ -547,7 +550,7 @@
     public void setEnableConfidenceLevels(boolean enableConfidenceLevels) {
 	this.enableConfidenceLevels = enableConfidenceLevels;
     }
-    
+
     public Integer getConfidenceLevelsType() {
 	return confidenceLevelsType;
     }
@@ -650,4 +653,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 -rb9300513239d652c59e3bfd190d0973295844f37 -rce97cec9b77669b1a07fe59949d2bd4d0aa3f901
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision b9300513239d652c59e3bfd190d0973295844f37)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision ce97cec9b77669b1a07fe59949d2bd4d0aa3f901)
@@ -390,7 +390,9 @@
 		service.setAttemptStarted(assessment, user, toolSessionId, pagedQuestionDtos);
 	    }
 
+	    // 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 -rdbfe968a22654befdc3670be5fd7512741c1d278 -rce97cec9b77669b1a07fe59949d2bd4d0aa3f901
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision dbfe968a22654befdc3670be5fd7512741c1d278)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision ce97cec9b77669b1a07fe59949d2bd4d0aa3f901)
@@ -36,11 +36,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();
 			}		
 		});
 
@@ -205,6 +205,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"/>