Index: lams_learning/web/mainnoflash.jsp
===================================================================
diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -r0e5777f5ca5d43661be2751d2ee1955a871c79ea
--- lams_learning/web/mainnoflash.jsp	(.../mainnoflash.jsp)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
+++ lams_learning/web/mainnoflash.jsp	(.../mainnoflash.jsp)	(revision 0e5777f5ca5d43661be2751d2ee1955a871c79ea)
@@ -50,14 +50,16 @@
         <script type="text/javascript">
      		var HTTPBASE = "<lams:LAMSURL/>JHB";
      		var presenceLabel = "<fmt:message key='label.presence'/>";
+     		var roomName = "${param.lessonID}" + "${param.createDateTime}";
+     		roomName = correctPresenceRoomName(roomName);
      		
 	    	window.onload=function(){
 				// if presence is enabled, attempt to login once the window is loaded
 				attemptLogin();
 			}
 			
 			function attemptLogin(){
-				doLogin("${param.presenceUrl}", "<lams:user property="userID"/>", "<lams:user property="userID"/>", "<lams:user property="userID"/>", "${param.lessonID}", "<lams:user property="firstName"/>" + " " + "<lams:user property="lastName"/>", false, false);
+				doLogin("${param.presenceUrl}", "<lams:user property="userID"/>", "<lams:user property="userID"/>", "<lams:user property="userID"/>", roomName, "<lams:user property="firstName"/>" + " " + "<lams:user property="lastName"/>", false, false);
 			}
 			
 			function attemptRegistration(){