Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r90d2d1906a8ed6088f190f7c4475437287d17ba6
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 90d2d1906a8ed6088f190f7c4475437287d17ba6)
@@ -268,7 +268,12 @@
 	    qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
 		generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
 		
-    	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+		
+		boolean lockWhenFinished=qaContent.isLockWhenFinished(); 
+	    logger.debug("lockWhenFinished: " + lockWhenFinished);
+	    generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
+
+	    request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
     	
     	qaLearningForm.resetAll();
 		logger.debug("fwd'ing to." + INDIVIDUAL_LEARNER_RESULTS);
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rc414207f6bea6d18c622ae361ffac8323750b3f5 -r90d2d1906a8ed6088f190f7c4475437287d17ba6
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision c414207f6bea6d18c622ae361ffac8323750b3f5)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 90d2d1906a8ed6088f190f7c4475437287d17ba6)
@@ -124,10 +124,13 @@
 
 			</div>
 
-			<p>
-				<fmt:message key="label.responses.locked" />
-			</p>
+			<c:if test="${generalLearnerFlowDTO.lockWhenFinished == 'true'}">
+				<p>
+					<fmt:message key="label.responses.locked" />
+				</p>
+			</c:if>
 
+
 			<div class="space-bottom-top small-space-top">
 				<html:button property="redoQuestions" styleClass="button"
 					onclick="submitMethod('redoQuestions');">