Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r002f9275f5ec93dc0f76d1eaff245a121781ea1a -r01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 002f9275f5ec93dc0f76d1eaff245a121781ea1a)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b)
@@ -362,6 +362,7 @@
 admin.return = Return to maintain LAMS
 admin.button.save = Save
 admin.hide.titles = Hide question titles for learners
+admin.autoexpand.justification = Expand justification panel on question answer
 label.answer.queue = Answer queue
 label.drag.and.drop = drag and drop answer to tick or cross
 label.correct = Correct
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -rf86d00ef0e3fc17667feabcec9a04b4b3ca4d619 -r01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision f86d00ef0e3fc17667feabcec9a04b4b3ca4d619)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b)
@@ -211,6 +211,8 @@
 
     // configuration keys
     public static final String CONFIG_KEY_HIDE_TITLES = "hideTitles";
+    
+    public static final String CONFIG_KEY_AUTO_EXPAND_JUSTIFICATION = "autoexpandJustification";
 
     public static final String ATTR_IS_QUESTION_ETHERPAD_ENABLED = "isQuestionEtherpadEnabled";
     
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230217.sql
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230217.sql	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230217.sql	(revision 01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b)
@@ -0,0 +1,14 @@
+-- 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-5366 Allow autoexpanding justification panel on question answer
+INSERT INTO `tl_laasse10_configuration` (`config_key`, `config_value`) VALUES ('autoexpandJustification', 'false');
+
+-- 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/web/controller/AdminController.java
===================================================================
diff -u -r670dd8e248dc4705c92031c79d05a99559e35024 -r01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AdminController.java	(.../AdminController.java)	(revision 670dd8e248dc4705c92031c79d05a99559e35024)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AdminController.java	(.../AdminController.java)	(revision 01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b)
@@ -58,6 +58,9 @@
 	assessmentService.setConfigValue(AssessmentConstants.CONFIG_KEY_HIDE_TITLES,
 		String.valueOf(adminForm.isHideTitles()));
 
+	assessmentService.setConfigValue(AssessmentConstants.CONFIG_KEY_AUTO_EXPAND_JUSTIFICATION,
+		String.valueOf(adminForm.isAutoexpandJustification()));
+
 	request.setAttribute("savedSuccess", true);
 	return "/pages/admin/config";
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -rf3e44aee5373a1233080ea5acd1cb5959bb46544 -r01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision f3e44aee5373a1233080ea5acd1cb5959bb46544)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b)
@@ -418,6 +418,8 @@
 
 	sessionMap.put(AssessmentConstants.CONFIG_KEY_HIDE_TITLES,
 		Boolean.valueOf(service.getConfigValue(AssessmentConstants.CONFIG_KEY_HIDE_TITLES)));
+	sessionMap.put(AssessmentConstants.CONFIG_KEY_AUTO_EXPAND_JUSTIFICATION,
+		Boolean.valueOf(service.getConfigValue(AssessmentConstants.CONFIG_KEY_AUTO_EXPAND_JUSTIFICATION)));
 
 	if (!codeStyles.isEmpty()) {
 	    request.setAttribute(AssessmentConstants.ATTR_CODE_STYLES, codeStyles);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AdminForm.java
===================================================================
diff -u -r670dd8e248dc4705c92031c79d05a99559e35024 -r01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AdminForm.java	(.../AdminForm.java)	(revision 670dd8e248dc4705c92031c79d05a99559e35024)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AdminForm.java	(.../AdminForm.java)	(revision 01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b)
@@ -25,11 +25,21 @@
 public class AdminForm {
     private boolean hideTitles;
 
+    private boolean autoexpandJustification;
+
     public boolean isHideTitles() {
 	return hideTitles;
     }
 
     public void setHideTitles(boolean hideTitles) {
 	this.hideTitles = hideTitles;
     }
+
+    public boolean isAutoexpandJustification() {
+	return autoexpandJustification;
+    }
+
+    public void setAutoexpandJustification(boolean autoexpandJustification) {
+	this.autoexpandJustification = autoexpandJustification;
+    }
 }
\ No newline at end of file
Index: lams_tool_assessment/web/pages/admin/config.jsp
===================================================================
diff -u -r670dd8e248dc4705c92031c79d05a99559e35024 -r01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b
--- lams_tool_assessment/web/pages/admin/config.jsp	(.../config.jsp)	(revision 670dd8e248dc4705c92031c79d05a99559e35024)
+++ lams_tool_assessment/web/pages/admin/config.jsp	(.../config.jsp)	(revision 01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b)
@@ -26,9 +26,16 @@
 			<form:form action="/lams/tool/laasse10/admin/saveContent.do" modelAttribute="adminForm" method="post" enctype="multipart/form-data">
 				<div class="checkbox">
 					<label>
-					<form:checkbox path="hideTitles"/>
-					<fmt:message key="admin.hide.titles" /></label>
+						<form:checkbox path="hideTitles"/>
+						<fmt:message key="admin.hide.titles" />
+					</label>
 				</div>
+				<div class="checkbox">
+					<label>
+						<form:checkbox path="autoexpandJustification"/>
+						<fmt:message key="admin.autoexpand.justification" />
+					</label>
+				</div>
 				<button class="btn btn-primary  pull-right"><fmt:message key="admin.button.save" /></button>
 			</form:form>
 			
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r8dd128cd0bad978452e065ebd52b4ee08feabc98 -r01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8dd128cd0bad978452e065ebd52b4ee08feabc98)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 01c1f3f4d4b901644b877fbdaf4bf10c7c0a503b)
@@ -179,7 +179,7 @@
 				};
 			</c:if>
 
-			<c:if test="${!isLeadershipEnabled or isUserLeader}">
+			<c:if test="${sessionMap.autoexpandJustification and (!isLeadershipEnabled or isUserLeader)}">
 				// auto expand justification panel on first click
 				$('.question-area').find('input, select, .ordering-option').on('click change', function(){
 					$(this).closest('.question-area').children('.answer-justification-container:not(.autoopened)')