Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r77e263b43c7aed360e8dcc46af273db55123bc83 -r417748835b9f669d47426a7683d0ae6e61e2cd06
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 417748835b9f669d47426a7683d0ae6e61e2cd06)
@@ -187,16 +187,6 @@
 		ForumUser forumUser = getCurrentUser(request,sessionId);
 		boolean lock =  forum.getLockWhenFinished() && forumUser.isSessionFinished();
 		
-		//add define later support
-		if(forum.isDefineLater()){
-			return mapping.findForward("defineLater");
-		}
-		//add run offline support
-		if(forum.getRunOffline()){
-			return mapping.findForward("runOffline");
-		}
-		
-		
 		//try to clone topics from :See bug LDEV-649 
 		Long contentId = forum.getContentId();
 		forumService.cloneContentTopics(contentId, sessionId);
@@ -220,6 +210,15 @@
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 		sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION,forum.getInstructions());
 		
+		//add define later support
+		if(forum.isDefineLater()){
+			return mapping.findForward("defineLater");
+		}
+		//add run offline support
+		if(forum.getRunOffline()){
+			return mapping.findForward("runOffline");
+		}
+				
 		// get all root topic to display on init page
 		List rootTopics = forumService.getRootTopics(sessionId);
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
diff -u -r9719695d2ad2c0dbe06c93d032eef994f634b9d5 -r417748835b9f669d47426a7683d0ae6e61e2cd06
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 9719695d2ad2c0dbe06c93d032eef994f634b9d5)
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 417748835b9f669d47426a7683d0ae6e61e2cd06)
@@ -1,4 +1,5 @@
 <%@ include file="/includes/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 
 <h1 class="no-tabs-below">
 	<fmt:message key="activity.title" />
@@ -16,14 +17,26 @@
 	</table>
 
 	<div class="right-buttons">
+		<c:set var="continue">
+			<html:rewrite page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
+		</c:set>
 		<c:set var="finish">
-			<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
+			<html:rewrite page="/learning/finish.do?sessionMapID=${sessionMapID}" />
 		</c:set>
 
 		<div class="buttons-right">
-			<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${finishedLock}" styleClass="button">
-				<fmt:message key="label.finish" />
-			</html:button>
+			<c:choose>
+				<c:when test="${sessionMap.reflectOn}">
+					<html:button property="continue" onclick="javascript:location.href='${continue}';" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:when>
+				<c:otherwise>
+					<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${sessionMap.finishedLock}" styleClass="button">
+						<fmt:message key="label.finish" />
+					</html:button>
+				</c:otherwise>
+			</c:choose>
 		</div>
 	</div>