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)')