Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u -r62210e3b3fc129093d235b83d585690eff4e0752 -rd20cc2eab0982891a206a72301e9ff0306184ed1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 62210e3b3fc129093d235b83d585690eff4e0752)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision d20cc2eab0982891a206a72301e9ff0306184ed1)
@@ -80,12 +80,15 @@
 		String action = request.getParameter(ACTION_NAME);
 		String modeStr = request.getParameter(ACTION_MODE);
 		String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID);
-		if(StringUtils.equals(ToolAccessMode.AUTHOR.toString(),modeStr))
-			clearSession(cSessionID,request.getSession(),ToolAccessMode.AUTHOR);
+
+		//clear session according to the ToolAccessMode.
 		if(StringUtils.equals(ToolAccessMode.LEARNER.toString(),modeStr))
 			clearSession(cSessionID,request.getSession(),ToolAccessMode.LEARNER);
-		if(StringUtils.equals(ToolAccessMode.TEACHER.toString(),modeStr))
+		else if(StringUtils.equals(ToolAccessMode.TEACHER.toString(),modeStr))
 			clearSession(cSessionID,request.getSession(),ToolAccessMode.TEACHER);
+		else //if(StringUtils.equals(ToolAccessMode.AUTHOR.toString(),modeStr)) : default value
+			clearSession(cSessionID,request.getSession(),ToolAccessMode.AUTHOR);
+		
 		if(StringUtils.equals(action,CONFIRM_ACTION)){
 			String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
 			String signature = request.getParameter(TOOL_SIGNATURE);