Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r19be54d4ab8af4ef6e1fdb487e9e253f3478916d -r63965284231a49ac1e8bbd263c2109f11df2992a
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 19be54d4ab8af4ef6e1fdb487e9e253f3478916d)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 63965284231a49ac1e8bbd263c2109f11df2992a)
@@ -1,6 +1,15 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
 
+<script type="text/javascript">
+	function disableFinishButton() {
+		var finishButton = document.getElementById("finishButton");
+		if (finishButton != null) {
+			finishButton.disabled = true;
+		}
+	}
+</script>
+
 <div id="content">
 
 <h1><c:out value="${NbLearnerForm.title}" escapeXml="false" /></h1>
@@ -9,7 +18,7 @@
 		<c:out value="${NbLearnerForm.content}" escapeXml="false" />
 	</p>
   	 
- 	<html:form action="/learner" target="_self"> 
+ 	<html:form action="/learner" target="_self" onsubmit="disableFinishButton();"> 
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="mode" />
   	 
@@ -48,7 +57,10 @@
 						</html:submit>
 					</c:when>
 					<c:otherwise>
-						<html:submit property="method" styleClass="button">
+						
+						<html:hidden property="method" value="Finish"/>
+							
+						<html:submit styleClass="button" styleId="finishButton">
 							<fmt:message key="button.finish" />
 						</html:submit>
 					</c:otherwise>
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -r58056cedf0eb43d205db8888040ed5c9454fbf29 -r63965284231a49ac1e8bbd263c2109f11df2992a
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 58056cedf0eb43d205db8888040ed5c9454fbf29)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 63965284231a49ac1e8bbd263c2109f11df2992a)
@@ -1,9 +1,12 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
+
+
 <script type="text/javascript">
+	
 	function disableFinishButton() {
-		var elem = document.getElementById("method");
-		// TODO, disable the button
+		var elem = document.getElementById("finishButton");
+		elem.disabled = true;
 	}
 	
 </script>
@@ -27,14 +30,15 @@
 		<html:form action="/learner" target="_self" onsubmit="disableFinishButton();">
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="mode" />
+			<html:hidden property="method" value="Finish"/>
 			<c:choose>
 				<c:when test="${reflectOnActivity}">
 					<html:submit property="method" styleClass="button">
 						<fmt:message key="button.continue" />
 					</html:submit>
 				</c:when>
 				<c:otherwise>
-					<html:submit property="method" styleClass="button" styleId="method">
+					<html:submit styleClass="button" styleId="finishButton">
 						<fmt:message key="button.finish" />
 					</html:submit>
 				</c:otherwise>
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -r19be54d4ab8af4ef6e1fdb487e9e253f3478916d -r63965284231a49ac1e8bbd263c2109f11df2992a
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 19be54d4ab8af4ef6e1fdb487e9e253f3478916d)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 63965284231a49ac1e8bbd263c2109f11df2992a)
@@ -1,11 +1,17 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
+<script type="text/javascript">
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+</script>
+
 <div id="content">
 <h1>
 	<c:out value="${title}" escapeXml="false" />
 </h1>
 
-	<html:form action="/learner" method="post">
+	<html:form action="/learner" method="post" onsubmit="disableFinishButton();">
 	 
 		<p><lams:out value="${reflectInstructions}" /></p>				
 			 
@@ -14,7 +20,8 @@
 		<div align="right" class="space-bottom-top">
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="mode" />
-			<html:submit property="method" styleClass="button">
+			<html:hidden property="method" value="Finish"/>
+			<html:submit styleClass="button" styleId="finishButton">
 				<fmt:message key="button.finish" />
 			</html:submit>
 		</div>