Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/learning.jsp,v
diff -u -r1.23 -r1.24
--- lams_tool_assessment/web/pages/learning/learning.jsp	25 Mar 2013 13:05:19 -0000	1.23
+++ lams_tool_assessment/web/pages/learning/learning.jsp	9 Apr 2013 12:46:47 -0000	1.24
@@ -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>