Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
===================================================================
diff -u -r8bc8d173f84ddf9333719585a3ddfd7a676f28be -rb2616ff3a4153db1ee5f5f3919772b3bb6224893
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java	(.../LoadToolActivityAction.java)	(revision 8bc8d173f84ddf9333719585a3ddfd7a676f28be)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java	(.../LoadToolActivityAction.java)	(revision b2616ff3a4153db1ee5f5f3919772b3bb6224893)
@@ -81,6 +81,7 @@
 				
 		form.setActivityID(activity.getActivityId());
 		
+		String mappingName = "displayTool";
 		if (activity.isToolActivity() || activity.isSystemToolActivity() ) {
 
 			String url = actionMappings.getLearnerToolURL(learnerProgress.getLesson(),activity, learnerProgress.getUser());
@@ -90,7 +91,7 @@
 				request.setAttribute(AttributeNames.PARAM_TITLE, activity.getTitle());
 				request.setAttribute(PARAM_ACTIVITY_URL, url);
 				request.setAttribute(PARAM_IS_BRANCHING, activity.isBranchingActivity());
-				return mapping.findForward("previewDefineLater");
+				mappingName = "previewDefineLater";
 			} else {
 				// normal case
 				form.addActivityURL(new ActivityURL(activity.getActivityId(),url));
@@ -102,7 +103,7 @@
 		}
 		
 		LearningWebUtil.setupProgressInRequest(form, request, learnerProgress);
-		return mapping.findForward("displayTool");
+		return mapping.findForward(mappingName);
 	}
 
 
Index: lams_learning/web/previewDefineLater.jsp
===================================================================
diff -u -r79277b017e807d1f8c32109349c10ad28daee807 -rb2616ff3a4153db1ee5f5f3919772b3bb6224893
--- lams_learning/web/previewDefineLater.jsp	(.../previewDefineLater.jsp)	(revision 79277b017e807d1f8c32109349c10ad28daee807)
+++ lams_learning/web/previewDefineLater.jsp	(.../previewDefineLater.jsp)	(revision b2616ff3a4153db1ee5f5f3919772b3bb6224893)
@@ -27,7 +27,13 @@
 	<%@ taglib uri="tags-lams" prefix="lams" %>
 
 
+<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
 
+<c:if test="${enableFlash}">
+	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}" version="${activityForm.version}" redirect="false"/>
+</c:if>
+
+
 	<div id="content">
 
 		<h1><fmt:message key="label.preview.definelater.title"/></h1>