Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r6f218a9b53c2931aba5ec703040db658da98fa52 -r06a6c167950bd4a3bc90be12854509e2a0ac6588
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 6f218a9b53c2931aba5ec703040db658da98fa52)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
@@ -224,7 +224,7 @@
 				</c:if>
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
-					<button onclick="javascript:submitMethod('learnerFinished');"
+					<button type="submit" onclick="javascript:submitMethod('learnerFinished');"
 						class="btn btn-primary pull-right voffset10 na" id="finishButton">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -r6f218a9b53c2931aba5ec703040db658da98fa52 -r06a6c167950bd4a3bc90be12854509e2a0ac6588
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 6f218a9b53c2931aba5ec703040db658da98fa52)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
@@ -106,8 +106,8 @@
 			</c:if>
 
 			<c:if test="${voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
-				<html:link href="#nogo" property="learnerFinished" styleClass="btn btn-primary voffset10 pull-right na"
-					styleId="finishButton" onclick="submitMethod('learnerFinished');return false">
+				<button type="submit" class="btn btn-primary voffset10 pull-right na"
+					id="finishButton" onclick="submitMethod('learnerFinished')">
 					<c:choose>
 						<c:when test="${activityPosition.last}">
 							<fmt:message key="button.submitActivity" />
@@ -117,7 +117,7 @@
 						</c:otherwise>
 					</c:choose>
 
-				</html:link>
+				</button>
 			</c:if>
 			<div id="footer"></div>
 
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
diff -u -r6f218a9b53c2931aba5ec703040db658da98fa52 -r06a6c167950bd4a3bc90be12854509e2a0ac6588
--- lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 6f218a9b53c2931aba5ec703040db658da98fa52)
+++ lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
@@ -41,10 +41,10 @@
 			</div>
 
 			<html:textarea rows="5" property="entryText" styleClass="form-control" styleId="focused"></html:textarea>
-			<html:submit property="submitReflection" onclick="javascript:submitMethod('submitReflection')"
-				styleClass="btn btn-primary voffset10 pull-right na" styleId="finishButton">
+			<button type="submit" onclick="javascript:submitMethod('submitReflection')"
+				class="btn btn-primary voffset10 pull-right na" id="finishButton">
 				<fmt:message key="button.endLearning" />
-			</html:submit>
+			</button>
 
 		</lams:Page>
 
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -r6f218a9b53c2931aba5ec703040db658da98fa52 -r06a6c167950bd4a3bc90be12854509e2a0ac6588
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 6f218a9b53c2931aba5ec703040db658da98fa52)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
@@ -113,9 +113,9 @@
 			</c:if>
 
 
-			<html:submit property="learnerFinished" styleId="finishButton"
+			<button type="submit" id="finishButton"
 				onclick="javascript:submitMethod('learnerFinished');"
-				styleClass="btn btn-primary voffset10 pull-right na">
+				class="btn btn-primary voffset10 pull-right na">
 				<c:choose>
 						<c:when test="${activityPosition.last}">
 							<fmt:message key="button.submitActivity" />
@@ -124,7 +124,7 @@
 							<fmt:message key="button.endLearning" />
 						</c:otherwise>
 				</c:choose>
-			</html:submit>
+			</button>
 			<div id="footer"></div>
 
 		</lams:Page>
Index: lams_tool_vote/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r6f218a9b53c2931aba5ec703040db658da98fa52 -r06a6c167950bd4a3bc90be12854509e2a0ac6588
--- lams_tool_vote/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 6f218a9b53c2931aba5ec703040db658da98fa52)
+++ lams_tool_vote/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
@@ -45,9 +45,9 @@
 			
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 
-					<html:submit property="endLearning" styleId="finishButton" 
+					<button type="submit"  id="finishButton" 
 				      onclick="javascript:submitMethod('learnerFinished')"
-				      styleClass="btn btn-primary voffset10 pull-right na">
+				      class="btn btn-primary voffset10 pull-right na">
 							<c:choose>
 								<c:when test="${activityPosition.last}">
 									<fmt:message key="button.submitActivity" />
@@ -56,7 +56,7 @@
 									<fmt:message key="button.endLearning" />
 								</c:otherwise>
 							</c:choose>
-					</html:submit>
+					</button>
 
 				</c:if>