Index: lams_tool_chat/web/pages/learning/notebook.jsp
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1395f246e4d712e6723dae1a9f9477c7ce87dd86
--- lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 1395f246e4d712e6723dae1a9f9477c7ce87dd86)
@@ -30,7 +30,7 @@
 				}
 			</script>
 			
-			<lams:Page type="learner" title="${chatDTO.title}">
+			<lams:Page type="learner" title="${chatDTO.title}" formID="learningForm">
 			
 				<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm" id="learningForm">
 			
@@ -42,7 +42,7 @@
 			
 					<form:hidden path="chatUserUID" />
 					<a href="#nogo" class="btn btn-primary pull-right voffset10 na" id="finishButton"
-						onclick="submitForm('finish')">
+						onclick="submitForm('finishActivity')">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
 								<fmt:message key="button.submit" />
Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1395f246e4d712e6723dae1a9f9477c7ce87dd86
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 1395f246e4d712e6723dae1a9f9477c7ce87dd86)
@@ -35,36 +35,41 @@
 			finishButton.disabled = true;
 		}
 	}
-         function submitForm(methodName){
-                var f = document.getElementById('learningForm');
-                f.submit();
-        }
+    function submitForm(metodName){
+        var f = document.getElementById("learningForm");
+        f.submit();
+    }
 </script>
 
-<form:form action="${!chatUserDTO.finishedActivity and chatDTO.reflectOnActivity ? 'openNotebook.do' : 'finishActivity.do'}" method="post"
-	onsubmit="disableFinishButton();"  modelAttribute="learningForm" id="learningForm">
-	<form:hidden path="chatUserUID" value="${chatUserDTO.uid}" />
+<c:choose>
+		<c:when test="${!chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
+	
+			<form:form action="openNotebook.do" method="post"
+			onsubmit="disableFinishButton();"  modelAttribute="learningForm" id="learningForm">
+			<form:hidden path="chatUserUID" value="${chatUserDTO.uid}" />
+			<input type="submit" value="<fmt:message key="button.continue" />" class="btn btn-responsive btn-primary pull-right voffset10"/>
+			</form:form>
+		
+		</c:when>
+		<c:otherwise>
+		
+			<form:form action="finishActivity.do" method="post"
+			onsubmit="disableFinishButton();"  modelAttribute="learningForm" id="learningForm">
+			<form:hidden path="chatUserUID" value="${chatUserDTO.uid}" />
+			<a href="#nogo" type="button" class="btn btn-primary pull-right voffset10 na btn-autoresize" id="finishButton"  onclick="submitForm('finishActivity')">
+						 <span class="nextActivity">
+							 <c:choose>
+							 	<c:when test="${activityPosition.last}">
+							 		 <fmt:message key="button.submit" />
+							 	</c:when>
+							 	<c:otherwise>
+							 		 <fmt:message key="button.finish" />
+							 	</c:otherwise>
+							 </c:choose>
+						 </span>
+					</a>
+			</form:form>
+		</c:otherwise>
+</c:choose>
 
-		<c:choose>
-			<c:when
-				test="${!chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
 
-				<input type="submit" value="<fmt:message key="button.continue" />" class="btn btn-responsive btn-primary pull-right voffset10"/>
-			</c:when>
-			<c:otherwise>
-				<a href="#nogo" class="btn btn-primary pull-right voffset10 na btn-autoresize" id="finishButton"  onclick="submitForm('finish')">
-					 <span class="nextActivity">
-						 <c:choose>
-						 	<c:when test="${activityPosition.last}">
-						 		 <fmt:message key="button.submit" />
-						 	</c:when>
-						 	<c:otherwise>
-						 		 <fmt:message key="button.finish" />
-						 	</c:otherwise>
-						 </c:choose>
-					 </span>
-				</a>
-			</c:otherwise>
-		</c:choose>
-	</div>
-</form:form>
Index: lams_tool_chat/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r7da4eb99b105fef928be8501f19e41f7bb3211ce -r1395f246e4d712e6723dae1a9f9477c7ce87dd86
--- lams_tool_chat/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7da4eb99b105fef928be8501f19e41f7bb3211ce)
+++ lams_tool_chat/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 1395f246e4d712e6723dae1a9f9477c7ce87dd86)
@@ -31,7 +31,7 @@
 				<fmt:message key="activity.title" />
 			</c:set>		
 
-		<lams:Page type="learner" title="${title}">
+		<lams:Page type="learner" title="${title}" formID="learningForm">
 			<lams:Alert type="danger" close="false" id="submissionDeadline">
 				<fmt:message key="authoring.info.teacher.set.restriction" >
 					<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>