Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r6a00a381d27bc31726597217200978ae4423be7e -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -193,7 +193,16 @@
 
 			<div class="align-right space-bottom-top">
                                <html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-                                     <span class="nextActivity"><fmt:message key="label.finish.button"/></span>
+                                     <span class="nextActivity">
+                                     	<c:choose>
+						 					<c:when test="${activityPosition.last}">
+						 						<fmt:message key="label.submit.button" />
+						 					</c:when>
+						 					<c:otherwise>
+						 		 				<fmt:message key="label.finish.button" />
+						 					</c:otherwise>
+						 				</c:choose>
+						 			 </span>
                                </html:link>
 			</div>