Index: lams_tool_zoom/web/pages/learning/notebook.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -rf003bd9ab52d6e93d8bf9b13079df1a041aabe72
--- lams_tool_zoom/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_zoom/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision f003bd9ab52d6e93d8bf9b13079df1a041aabe72)
@@ -20,7 +20,13 @@
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}learning/includes/javascript/gate-check.js"></script>
+		
 	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${learningForm.toolSessionID}', '', function(){
+			$('#learningForm').submit();
+		});
+		
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
@@ -38,7 +44,7 @@
 			<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control" />
 	
 			<form:hidden path="toolSessionID" />
-			<button type="submit" class="btn btn-primary pull-right voffset10 na" id="finishButton">
+			<button type="button" class="btn btn-primary pull-right voffset10 na" id="finishButton">
 				<c:choose>
 					<c:when test="${isLastActivity}">
 						<fmt:message key="button.submit" />
Index: lams_tool_zoom/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -rf003bd9ab52d6e93d8bf9b13079df1a041aabe72
--- lams_tool_zoom/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_zoom/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision f003bd9ab52d6e93d8bf9b13079df1a041aabe72)
@@ -1,13 +1,19 @@
 <%@ include file="/common/taglibs.jsp"%>
-
-<script type="text/javascript">
-	function disableFinishButton() {
-		var finishButton = document.getElementById("finishButton");
-		if (finishButton != null) {
-			finishButton.disabled = true;
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}learning/includes/javascript/gate-check.js"></script>
+	
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${learningForm.toolSessionID}', '', function(){
+			$('#finishForm').submit();
+		});
+		
+		function disableFinishButton() {
+			var finishButton = document.getElementById("finishButton");
+			if (finishButton != null) {
+				finishButton.disabled = true;
+			}
 		}
-	}
-</script>
+	</script>
 
 <c:set var="notebookEntry" scope="request">
 	<fmt:message key="label.notebookEntry" />
@@ -46,15 +52,15 @@
 </form:form>
 
 <form:form action="${!userDTO.finishedActivity and contentDTO.reflectOnActivity ? 'openNotebook.do' : 'finishActivity.do'}"
-		   method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm">
+		   method="post" onsubmit="disableFinishButton();" modelAttribute="learningForm" id="finishForm">
 	<form:hidden path="toolSessionID" />
 	<div class="pull-right voffset10">
 		<c:choose>
 			<c:when test="${!userDTO.finishedActivity and contentDTO.reflectOnActivity}">
 				<button type="submit" class="btn btn-primary"><fmt:message key="button.continue" /></button>
 			</c:when>
 			<c:otherwise>
-				<button type="submit" class="btn btn-primary na" id="finishButton">
+				<button type="button" class="btn btn-primary na" id="finishButton">
 					<c:choose>
 						<c:when test="${isLastActivity}">
 							<fmt:message key="button.submit" />