Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8bcf5f3b87aa5b9bcead80b6c2c06a5982513b41 -r88aed13531804313250bc33b09743ed763b2824e
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8bcf5f3b87aa5b9bcead80b6c2c06a5982513b41)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 88aed13531804313250bc33b09743ed763b2824e)
@@ -372,6 +372,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 -r8bcf5f3b87aa5b9bcead80b6c2c06a5982513b41 -r88aed13531804313250bc33b09743ed763b2824e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 8bcf5f3b87aa5b9bcead80b6c2c06a5982513b41)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 88aed13531804313250bc33b09743ed763b2824e)
@@ -215,6 +215,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/web/controller/LearningController.java
===================================================================
diff -u -rb072d787da37f5d679699bd265216ad6397a7614 -r88aed13531804313250bc33b09743ed763b2824e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision b072d787da37f5d679699bd265216ad6397a7614)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 88aed13531804313250bc33b09743ed763b2824e)
@@ -438,6 +438,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/web/pages/learning/learning.jsp
===================================================================
diff -u -rbece54098a443d1f41cc8bab62f3d65761ca968e -r88aed13531804313250bc33b09743ed763b2824e
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision bece54098a443d1f41cc8bab62f3d65761ca968e)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 88aed13531804313250bc33b09743ed763b2824e)
@@ -178,6 +178,14 @@
 					location.reload();
 				};
 			</c:if>
+
+			<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)')
+						   .addClass('autoopened').children('.collapse').collapse('show');
+				});
+			</c:if>
 		});
 		
 		function countHedgeQuestionSelectTotal(questionIndex) {