Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
===================================================================
diff -u -r426b357d062c154d5e33e575d44abab5f12dca62 -r20c41464331ccdc7a9a8e25abad1818855c47f67
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 426b357d062c154d5e33e575d44abab5f12dca62)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 20c41464331ccdc7a9a8e25abad1818855c47f67)
@@ -127,6 +127,7 @@
 		request.setAttribute("NICK", chatUser.getJabberNickname());
 		request.setAttribute("MODE", "learner");
 		request.setAttribute("USER_UID", chatUser.getUid());
+		request.setAttribute("SESSION_ID", toolSessionID);
 		request
 				.setAttribute("LEARNER_FINISHED", chatUser
 						.getFinishedActivity());
@@ -165,6 +166,7 @@
 			HttpServletRequest request, HttpServletResponse response) {
 
 		Long chatUserUID = WebUtil.readLongParam(request, "chatUserUID");
+		Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID");
 
 		// set the finished flag
 		ChatUser chatUser = chatService.getUserByUID(chatUserUID);
@@ -188,7 +190,7 @@
 
 		String nextActivityUrl;
 		try {
-			nextActivityUrl = sessionMgrService.leaveToolSession(new Long(1),
+			nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID,
 					userID);
 			response.sendRedirect(nextActivityUrl);
 		} catch (DataMissingException e) {
Index: lams_tool_chat/web/chat_client/chat_ui.jsp
===================================================================
diff -u -r7c0c408e15f94b0c133d296b19d34398fa3436f9 -r20c41464331ccdc7a9a8e25abad1818855c47f67
--- lams_tool_chat/web/chat_client/chat_ui.jsp	(.../chat_ui.jsp)	(revision 7c0c408e15f94b0c133d296b19d34398fa3436f9)
+++ lams_tool_chat/web/chat_client/chat_ui.jsp	(.../chat_ui.jsp)	(revision 20c41464331ccdc7a9a8e25abad1818855c47f67)
@@ -20,6 +20,7 @@
 	var RESOURCE = "lams_chatclient";
 	var MODE = "${MODE}";
 	var USER_UID = "${USER_UID}";	
+	var SESSION_ID = "${SESSION_ID}";
 	var LEARNER_FINISHED = "${LEARNER_FINISHED}";
 	var LOCK_ON_FINISHED = "${LOCK_ON_FINISHED}";	
 </script>
@@ -75,6 +76,7 @@
 			<div>
 				<input type="hidden" name="dispatch" value="finishActivity" />
 				<input type="hidden" name="chatUserUID" value="${USER_UID}" />
+				<input type="hidden" name="toolSessionID" value="${SESSION_ID}" />				
 				<input type="submit" value='<fmt:message>button.finish</fmt:message>' />
 			</div>
 		</form>