Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
===================================================================
diff -u -r286529738e8e897f53c48bab757bfa634df59a95 -ra1ccd73a7050b1e2466b6c2d867a174696cb2bf0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 286529738e8e897f53c48bab757bfa634df59a95)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision a1ccd73a7050b1e2466b6c2d867a174696cb2bf0)
@@ -115,10 +115,6 @@
 
 	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID));
 	
-	String toolContentId = mcSession.getMcContent().getMcContentId().toString();
-	mcLearningForm.setToolContentID(toolContentId);
-
-	LearningUtil.saveFormRequestData(request, mcLearningForm);
 	/*
 	 * by now, we made sure that the passed tool session id exists in the db as a new record Make sure we can
 	 * retrieve it and the relavent content
@@ -140,6 +136,8 @@
 	}
 
 	String mode = request.getParameter(McAppConstants.MODE);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	
 	McQueUsr user = null;
 	if ((mode != null) && mode.equals(ToolAccessMode.TEACHER.toString())) {
 	    // monitoring mode - user is specified in URL
@@ -259,7 +257,7 @@
      * ActionForward endLearning(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
      * response)
      */
-    @ModelAttribute("/endLearning")
+    @RequestMapping("/endLearning")
     public String endLearning(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
 
@@ -783,13 +781,18 @@
     }
 
     private McQueUsr getCurrentUser(String toolSessionId) {
-	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionId));
 
 	// get back login user DTO
 	HttpSession ss = SessionManager.getSession();
 	UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	Long userId = new Long(toolUser.getUserID().longValue());
 
+	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionId));
+	McQueUsr qaUser = mcService.getMcUserBySession(userId, mcSession.getUid());
+	if (qaUser == null) {
+	    qaUser = mcService.createMcUser(new Long(toolSessionId));
+	}
+
 	return mcService.getMcUserBySession(userId, mcSession.getUid());
     }
 
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r286529738e8e897f53c48bab757bfa634df59a95 -ra1ccd73a7050b1e2466b6c2d867a174696cb2bf0
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 286529738e8e897f53c48bab757bfa634df59a95)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision a1ccd73a7050b1e2466b6c2d867a174696cb2bf0)
@@ -3,6 +3,7 @@
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" scope="request" />
 <c:set var="isUserLeader" value="${sessionMap.isUserLeader}" scope="request" />
+<c:set var="mode" value="${sessionMap.mode}" />
 <c:set var="mode" value="${sessionMap.mode}" scope="request" />
 <c:set var="isLeadershipEnabled" value="${sessionMap.content.useSelectLeaderToolOuput}" scope="request" />
 <c:set var="isPrefixAnswersWithLetters" value="${sessionMap.content.prefixAnswersWithLetters}" scope="request" />