Index: lams_learning/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r8f18cfdb071443d71e7f5c5ae3d728c762e2ebc3 -r0c6c5f6da5f100dcb69b117554414ef8eb2e27cc
--- lams_learning/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 8f18cfdb071443d71e7f5c5ae3d728c762e2ebc3)
+++ lams_learning/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 0c6c5f6da5f100dcb69b117554414ef8eb2e27cc)
@@ -33,13 +33,18 @@
 <%@ tag body-content="empty" %>
 <%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %>
 <%@ attribute name="id" required="true" rtexprvalue="true" %>
+<%@ attribute name="redirect" required="false" rtexprvalue="true" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <c:if test="${!empty progress}">
 		<c:set var="randomID">
 			<lams:generateID id="${id}"/>
 		</c:set>
 			<c:set var="passonurl_params" value="?${progress}&lessonID=${id}&uniqueID=${randomID}"/>
+			<c:if test="${redirect}">
+				<c:set var="passonurl_params" value="${passonurl_params}&redirect=true"/>
+			</c:if>
+			
 			<c:set var="passonurl_nojs" value="passon.swf${passonurl_params}"/>
 			<c:set var="passonurl_js" value="passon${passonurl_params}"/>
 			
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -r88e368163f647f4dec71a7ad2b2e4afe60526af5 -r0c6c5f6da5f100dcb69b117554414ef8eb2e27cc
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 88e368163f647f4dec71a7ad2b2e4afe60526af5)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 0c6c5f6da5f100dcb69b117554414ef8eb2e27cc)
@@ -38,7 +38,7 @@
 
 %>
 
-<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}"/>
+<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}" redirect="true"/>
 
 <h1 class="no-tabs-below">&nbsp;</h1>
 <div id="header-no-tabs-learner">
@@ -51,7 +51,7 @@
 		
 		<script language="JavaScript" type="text/JavaScript"><!--
 			function redirectPage() {
-				setTimeout("doRedirect()", 1000);
+				//setTimeout("doRedirect()", 500);
 			}
 			function doRedirect() {
 				var url = "<c:out value='${activityForm.activityURLs[0].url}' escapeXml="false" />";
@@ -65,7 +65,7 @@
 				window.location.href = url;
 			}
 			
-				window.onload = redirectPage;
+				//window.onload = redirectPage;
 			//-->
 		</script>