Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -r6a00a381d27bc31726597217200978ae4423be7e -r8aded0b18a5a7712622ae56f38923fa297449977
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
@@ -65,7 +65,16 @@
 
 			<table><tr><td><div id="right" class="right-buttons">
 					<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></td></tr></table>
 	</c:if>