Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
@@ -95,12 +95,11 @@
 		String param = mapping.getParameter();
 		//-----------------------Resource Author function ---------------------------
 		if(param.equals("start")){
-			request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR);
+			request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR.toString());
 			return start(mapping, form, request, response);
 		}
 		if (param.equals("definelater")) {
 			//update define later flag to true
-			request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER);
 			Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 			IResourceService service = getResourceService();
 			Resource resource = service.getResourceByContentId(contentId);
@@ -116,16 +115,14 @@
 				service.saveOrUpdateResource(resource);
 			}
 			
+			request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER.toString());
 			return start(mapping, form, request, response);
 		}		
 	  	if (param.equals("initPage")) {
        		return initPage(mapping, form, request, response);
         }
-//	  	if (param.equals("monitoringInitPage")) {
-////	  		request.getSession().setAttribute(ForumConstants.MODE,ForumConstants.MONITOR_MODE);
-//	  		return initPage(mapping, form, request, response);
-//	  	}
-        if (param.equals("updateContent")) {
+
+	  	if (param.equals("updateContent")) {
        		return updateContent(mapping, form, request, response);
         }
         if (param.equals("uploadOnlineFile")) {
@@ -392,7 +389,7 @@
 	 */
 	private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
+		ToolAccessMode mode = getAccessMode(request);
 		if(mode.isAuthor())
 			return mapping.findForward(ResourceConstants.SUCCESS);
 		else
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -rdd8218cfa50710015a253505c93a4070e6b29435 -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision dd8218cfa50710015a253505c93a4070e6b29435)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
@@ -46,7 +46,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
@@ -75,7 +74,6 @@
 			HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
 		
 		String param = mapping.getParameter();
-		request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.LEARNER);
 		//-----------------------Resource Learner function ---------------------------
 		if(param.equals("start")){
 			return start(mapping, form, request, response);
@@ -120,7 +118,6 @@
 			return mapping.getInputForward();
 			
 		}
-		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
 		// get sessionId from HttpServletRequest
 		String nextActivityUrl = null ;
 		try {
@@ -222,6 +219,8 @@
 	 */
 	private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		//save toolContentID into HTTPSession
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
+		
 		Long sessionId =  new Long(request.getParameter(ResourceConstants.PARAM_TOOL_SESSION_ID));
 		request.getSession().setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID,sessionId);
 		
@@ -294,6 +293,7 @@
 		resource.setDefineLater(false);
 		service.saveOrUpdateResource(resource);
 		
+		request.setAttribute(AttributeNames.ATTR_MODE,mode);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 	//*************************************************************************************
Index: lams_tool_larsrc/web/pages/authoring/start.jsp
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4
--- lams_tool_larsrc/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
@@ -1,7 +1,7 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <body>
-<form action="<c:url value='/authoring/init.do'/>" method="post" id="startForm">
+<form action="<c:url value='/authoring/init.do?mode=${mode}'/>" method="post" id="startForm">
 	<input type="hidden" name="toolContentID" value="${toolContentID}"/>
 </form>
 
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r356eb906d0a80130e76929e9cd914b57304887ff -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 356eb906d0a80130e76929e9cd914b57304887ff)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
@@ -27,7 +27,7 @@
  		    return false;
 		}
 		function viewItem(itemUid){
-			var myUrl = "<c:url value="/reviewItem.do"/>?mode=learner&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
+			var myUrl = "<c:url value="/reviewItem.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
 			launchPopup(myUrl,"LearnerView");
 		}
 		function completeItem(itemUid){
Index: lams_tool_larsrc/web/pages/learning/start.jsp
===================================================================
diff -u -r1dcb265570c3043908973a86db792f67133645e1 -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4
--- lams_tool_larsrc/web/pages/learning/start.jsp	(.../start.jsp)	(revision 1dcb265570c3043908973a86db792f67133645e1)
+++ lams_tool_larsrc/web/pages/learning/start.jsp	(.../start.jsp)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
@@ -5,7 +5,7 @@
 		<c:choose>
 			<c:when test="${runAuto}">
 				<script type="text/javascript">
-					document.location = "<c:url value="/reviewItem.do"/>?mode=learner&toolSessionID=${toolSessionID}&itemUid=${itemUid}";
+					document.location = "<c:url value="/reviewItem.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&itemUid=${itemUid}";
 				</script>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r91331dfb80134a0a25194610b14304e22c3af422 -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 91331dfb80134a0a25194610b14304e22c3af422)
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
@@ -26,7 +26,7 @@
 			<c:set var="isPageEditable" value="${isPageEditable}" />
 			<c:choose>
 				<c:when test='${isPageEditable == "true"}'>
-					<c:url value="/authoring/init.do" var="authoringUrl">
+					<c:url value="/definelater.do" var="authoringUrl">
 						<c:param name="toolContentID" value="${toolContentID}" />
 					</c:url>
 					<html:link href="${authoringUrl}" styleClass="button" target="_blank">