Index: lams_central/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r827fef1c3da3692dc865c3ae99a92ddecfdc643b -re182e8855b819d6198fb714a61246f2714caee87
--- lams_central/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
+++ lams_central/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision e182e8855b819d6198fb714a61246f2714caee87)
@@ -31,36 +31,39 @@
  
  %>
 <%@ tag body-content="empty" %>
-<%@ attribute name="progress" required="true" rtexprvalue="true" %>
+<%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-
 <c:if test="${!empty progress}">
-		<c:set var="passonurl">passon.swf?${progress}&uniqueID=<c:out value="<script language='text/javascript'>document.write(parent.frames['controlFrame'].uniqueID);</script>" escapeXml="false"/></c:set>
-		<!-- URL's used in the movie-->
-		<!-- text used in the movie-->
-		<!--Library-->  
-		<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-		 codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" name="passon"
-		 width="1" height="1" align="left" id="passon">
-		  <param name="allowScriptAccess" value="sameDomain" />
-	
-		  <param name="movie" value="<c:out value="${passonurl}" escapeXml="false"/>"/>
-		  <param name="quality" value="high">
-		  <param name="scale" value="noscale">
-		  <param name="bgcolor" value="#FFFFFF">
-		  <embed 	
-			  src="<c:out value="${passonurl}" escapeXml="false"/>"
-			  quality="high" 
-			  scale="noscale" 
-			  bgcolor="#FFFFFF"  
-			  width="1" 
-			  height="1" 
-			  swliveconnect=true 
-			  id="passon" 
-			  name="passon" 
-			  align=""
-			  type="application/x-shockwave-flash" 
-			  pluginspage="http://www.macromedia.com/go/getflashplayer" />
-		</object>
+		<c:set var="randomID">
+			<lams:generateID/>
+		</c:set>
+			<c:set var="passonurl" value="passon.swf?${progress}&uniqueID=${randomID}"/>
+			
+			<!-- URL's used in the movie-->
+			<!-- text used in the movie-->
+			<!--Library-->  
+			<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+			 codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" name="passon"
+			 width="1" height="1" align="left" id="passon">
+			  <param name="allowScriptAccess" value="sameDomain" />
+		
+			  <param name="movie" value="${passonurl}"/>
+			  <param name="quality" value="high">
+			  <param name="scale" value="noscale">
+			  <param name="bgcolor" value="#FFFFFF">
+			  <embed 	
+				  src="<c:out value="${passonurl}" escapeXml="false"/>"
+				  quality="high" 
+				  scale="noscale" 
+				  bgcolor="#FFFFFF"  
+				  width="1" 
+				  height="1" 
+				  swliveconnect=true 
+				  id="passon" 
+				  name="passon" 
+				  align=""
+				  type="application/x-shockwave-flash" 
+				  pluginspage="http://www.macromedia.com/go/getflashplayer" />
+			</object>
 </c:if>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -rcf7543e2fe6c7e318de8005ae28d045ad371e984 -re182e8855b819d6198fb714a61246f2714caee87
--- lams_learning/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision cf7543e2fe6c7e318de8005ae28d045ad371e984)
+++ lams_learning/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision e182e8855b819d6198fb714a61246f2714caee87)
@@ -32,13 +32,13 @@
  %>
 <%@ tag body-content="empty" %>
 <%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %>
-<%@ attribute name="uniqueID" required="false" rtexprvalue="true" type="java.lang.String" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <c:if test="${!empty progress}">
-	<c:choose>
-		<c:when test="${!empty uniqueID}">
-			<c:set var="passonurl" value="passon.swf?${progress}&uniqueID=${uniqueID}"/>
+		<c:set var="randomID">
+			<lams:generateID/>
+		</c:set>
+			<c:set var="passonurl" value="passon.swf?${progress}&uniqueID=${randomID}"/>
 			
 			<!-- URL's used in the movie-->
 			<!-- text used in the movie-->
@@ -66,15 +66,4 @@
 				  type="application/x-shockwave-flash" 
 				  pluginspage="http://www.macromedia.com/go/getflashplayer" />
 			</object>
-		</c:when>
-		<c:otherwise>
-				<script language="JavaScript" type="text/JavaScript">
-					<!--
-					var query = (window.location.search!="")?window.location.search + "&uID=":"?uID=";
-					alert(window.location.pathname + query);
-					window.location.href = window.location.pathname + query + parent.frames['controlFrame'].uniqueID;
-					//-->
-				</script>
-		</c:otherwise>
-	</c:choose>
 </c:if>
\ No newline at end of file
Index: lams_learning/web/controlFrame.jsp
===================================================================
diff -u -r7f0dafb4f267bc0f6295106f3babe749baa4a2ee -re182e8855b819d6198fb714a61246f2714caee87
--- lams_learning/web/controlFrame.jsp	(.../controlFrame.jsp)	(revision 7f0dafb4f267bc0f6295106f3babe749baa4a2ee)
+++ lams_learning/web/controlFrame.jsp	(.../controlFrame.jsp)	(revision e182e8855b819d6198fb714a61246f2714caee87)
@@ -35,9 +35,6 @@
 		<c:set var="randomID">
 			<lams:generateID/>
 		</c:set>
-		<script language="JavaScript" type="text/javascript">
-			var uniqueID = "<%= pageContext.getAttribute("randomID") %>";
-		</script>
 	</head>
 	<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 	
Index: lams_learning/web/lessonComplete.jsp
===================================================================
diff -u -r25162e7c6bb6041f0f095ffd5bbd93609e48ef91 -re182e8855b819d6198fb714a61246f2714caee87
--- lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision 25162e7c6bb6041f0f095ffd5bbd93609e48ef91)
+++ lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision e182e8855b819d6198fb714a61246f2714caee87)
@@ -27,7 +27,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <div align="center" class="mainHeader"> 
- 	<lams:Passon progress="${activityForm.progressSummary}" uniqueID="${param.uID}"/>
+ 	<lams:Passon progress="${activityForm.progressSummary}"/>
  
     <p class="heading"><fmt:message key="message.lesson.finished" /></p>
     <p class="body"><fmt:message key="message.lesson.finishedCont" /></p>
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -r25162e7c6bb6041f0f095ffd5bbd93609e48ef91 -re182e8855b819d6198fb714a61246f2714caee87
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 25162e7c6bb6041f0f095ffd5bbd93609e48ef91)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision e182e8855b819d6198fb714a61246f2714caee87)
@@ -39,7 +39,7 @@
 %>
 <body bgcolor="#9DC5EC">
 
-	<lams:Passon progress="${activityForm.progressSummary}" uniqueID="${param.uID}"/>
+	<lams:Passon progress="${activityForm.progressSummary}"/>
 	
 	<c:if test="${!empty activityForm.activityURLs}">
 		
@@ -59,11 +59,7 @@
 				window.location.href = url;
 			}
 			
-			var param = "<%= request.getParameter("uID") %>";
-			
-			if(param != "null"){
 				window.onload = redirectPage;
-			}
 			//-->
 		</script>
 		
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r25162e7c6bb6041f0f095ffd5bbd93609e48ef91 -re182e8855b819d6198fb714a61246f2714caee87
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 25162e7c6bb6041f0f095ffd5bbd93609e48ef91)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision e182e8855b819d6198fb714a61246f2714caee87)
@@ -56,7 +56,7 @@
 		//-->
 	</script>
 	
-	<lams:Passon progress="${optionsActivityForm.progressSummary}" uniqueID="${param.uID}"/>
+	<lams:Passon progress="${optionsActivityForm.progressSummary}"/>
 	
 		<html:form action="/ChooseActivity" method="POST">
 		<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />