Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rb652cf47563185ee684068696c5af1bb96f8b0fa -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b652cf47563185ee684068696c5af1bb96f8b0fa)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -251,11 +251,19 @@
 								</c:when>
 								<c:otherwise>
 									<html:link href="#nogo" property="FinishButton" onclick="return finishSession()" styleClass="button">
-										<span class="nextActivity"><fmt:message key="label.learning.next.activity" /></span>
+										<span class="nextActivity">
+											<c:choose>
+							 					<c:when test="${sessionMap.activityPosition.last}">
+							 						<fmt:message key="label.submit" />
+							 					</c:when>
+							 					<c:otherwise>
+							 		 				<fmt:message key="label.finished" />
+							 					</c:otherwise>
+							 				</c:choose>
+		 								</span>
 									</html:link>
 								</c:otherwise>
 							</c:choose>
-
 						</c:if>
 					</c:otherwise>
 				</c:choose>