Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r8b51e7543717ab3982989e3dd3662c88e192426f -r5b5b55640d09c6da2d8c6c16d9be7d89e9387717
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 8b51e7543717ab3982989e3dd3662c88e192426f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 5b5b55640d09c6da2d8c6c16d9be7d89e9387717)
@@ -100,9 +100,6 @@
             HttpServletRequest request,
             HttpServletResponse response)
     {
-		//to avoid user without patience click "upload" button too fast
-		saveToken(request);
-
     	//initial session Map
     	SessionMap sessionMap = new SessionMap();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -191,10 +188,7 @@
 		 //set the mode into http session 
         Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
        	
-		if(!isTokenValid(request,true) || validateUploadForm(learnerForm,request)){
-			if(!isTokenValid(request,true))
-				resetToken(request);
-			
+		if(validateUploadForm(learnerForm,request)){
 			//get session from shared session.
 			HttpSession ss = SessionManager.getSession();
 			//get back login user DTO
@@ -209,8 +203,6 @@
 			
 			return mapping.getInputForward();
 		}
-		//to avoid user without patience click "upload" button too fast 
-		saveToken(request);
 		
 		//get session from shared session.
 		HttpSession ss = SessionManager.getSession();
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -rcb76f52be2b0d9280291cf11cac9f4efe99a0648 -r5b5b55640d09c6da2d8c6c16d9be7d89e9387717
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5b5b55640d09c6da2d8c6c16d9be7d89e9387717)
@@ -94,7 +94,7 @@
 				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 					toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" 
 					customiseSessionID="${formBean.sessionMapID}" 
-					contentFolderID="abc"/>
+					contentFolderID="${formBean.contentFolderID}"/>
 			</html:form>
 		</div>
 		<div id="footer"></div>
Index: lams_tool_sbmt/web/authoring/definelater.jsp
===================================================================
diff -u -rcb76f52be2b0d9280291cf11cac9f4efe99a0648 -r5b5b55640d09c6da2d8c6c16d9be7d89e9387717
--- lams_tool_sbmt/web/authoring/definelater.jsp	(.../definelater.jsp)	(revision cb76f52be2b0d9280291cf11cac9f4efe99a0648)
+++ lams_tool_sbmt/web/authoring/definelater.jsp	(.../definelater.jsp)	(revision 5b5b55640d09c6da2d8c6c16d9be7d89e9387717)
@@ -62,6 +62,7 @@
 				<html:hidden property="mode" value="teacher" />
 				<html:hidden property="sessionMapID" />				
 				<html:hidden property="toolContentID" />
+				<html:hidden property="contentFolderID" />
 				<html:hidden property="currentTab" styleId="currentTab" />
 				<html:hidden property="dispatch" value="updateContent" />
 
@@ -70,7 +71,7 @@
 
 				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" accessMode="teacher" 
 					toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" defineLater="true" 
-					customiseSessionID="${formBean.sessionMapID}" />
+					customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}"/>
 			</html:form>
 		</div>
 		<div id="footer"></div>
Index: lams_tool_sbmt/web/monitoring/notebook.jsp
===================================================================
diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -r5b5b55640d09c6da2d8c6c16d9be7d89e9387717
--- lams_tool_sbmt/web/monitoring/notebook.jsp	(.../notebook.jsp)	(revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37)
+++ lams_tool_sbmt/web/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 5b5b55640d09c6da2d8c6c16d9be7d89e9387717)
@@ -37,7 +37,7 @@
 								<c:out value="${userDTO.reflect}" escapeXml="false"/>
 							</c:when>
 							<c:otherwise>
-								<fmt:message key="message.not.avaliable" />
+								<fmt:message key="label.learner.notAvailable" />
 							</c:otherwise>
 						</c:choose>
 					</td>