Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
===================================================================
diff -u -rb5128351d7fc3dce7a7ccd6b7a3374adfdba9774 -rb08884249ff03162cb4c7b8cab5dbd48ea03da63
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision b5128351d7fc3dce7a7ccd6b7a3374adfdba9774)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision b08884249ff03162cb4c7b8cab5dbd48ea03da63)
@@ -170,7 +170,8 @@
 		//basic information
 		sessionMap.put(SurveyConstants.ATTR_TITLE,survey.getTitle());
 		sessionMap.put(SurveyConstants.ATTR_SURVEY_INSTRUCTION,survey.getInstructions());
-		sessionMap.put(SurveyConstants.ATTR_FINISH_LOCK,lock);
+		sessionMap.put(SurveyConstants.ATTR_FINISH_LOCK, lock);
+		sessionMap.put(SurveyConstants.ATTR_LOCK_ON_FINISH, survey.getLockWhenFinished());
 		sessionMap.put(SurveyConstants.ATTR_SHOW_ON_ONE_PAGE,survey.isShowOnePage());
 		sessionMap.put(SurveyConstants.ATTR_USER_FINISHED, surveyUser.isSessionFinished());
 		
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r2495e17b412e141f3827b7edee81e43475d16d07 -rb08884249ff03162cb4c7b8cab5dbd48ea03da63
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision b08884249ff03162cb4c7b8cab5dbd48ea03da63)
@@ -42,6 +42,19 @@
 			<c:out value="${sessionMap.instructions}" escapeXml="false" />
 		</p>
 
+		<c:if test="${sessionMap.lockOnFinish}">
+				<div class="info">
+					<c:choose>
+						<c:when test="${sessionMap.userFinished}">
+							<fmt:message key="message.activityLocked" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="message.warnLockOnFinish" />
+						</c:otherwise>
+					</c:choose>
+				</div>
+		</c:if>
+		
 		<c:forEach var="element" items="${sessionMap.questionList}">
 			<div class="shading-bg">
 				<c:set var="question" value="${element.value}" />