Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -rf6f0e93d2134d055aadd9414aee1b588f0669c19 -rffabb2dde38a13ce01088c5787de450db4f271db
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision ffabb2dde38a13ce01088c5787de450db4f271db)
@@ -166,10 +166,11 @@
 			return mapping.findForward("error");
 		}
 		
+		Forum forum = session.getForum();
+		//lock on finish
 		ForumUser forumUser = getCurrentUser(request,sessionId);
-		boolean lock = forumUser.isSessionFinished();
+		boolean lock =  forum.getLockWhenFinished() && forumUser.isSessionFinished();
 		
-		Forum forum = session.getForum();
 		//add define later support
 		if(forum.isDefineLater()){
 			return mapping.findForward("defineLater");