Index: lams_learning/web/mainnoflash.jsp
===================================================================
diff -u -r5bdc7f93cfd1d06601a3dcc016546903bd170fab -rdeab1a0aef578ae38f893dd99735fd61cbb85936
--- lams_learning/web/mainnoflash.jsp	(.../mainnoflash.jsp)	(revision 5bdc7f93cfd1d06601a3dcc016546903bd170fab)
+++ lams_learning/web/mainnoflash.jsp	(.../mainnoflash.jsp)	(revision deab1a0aef578ae38f893dd99735fd61cbb85936)
@@ -45,19 +45,32 @@
 
       	<c:if test="${param.presenceEnabledPatch}"> 		 
         <script type="text/javascript">
-     
+     		var HTTPBASE = "<lams:LAMSURL/>JHB";
+     		
 	    	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);
-				
 			}
 			
+			function attemptRegistration(){
+				$.get("<lams:LAMSURL/>Presence.do", {method: "createXmppId"}, handlePresenceRegistration);
+			}
+			
+			function handlePresenceRegistration(registrationInfo){
+				// if registrationInfo exists, registration worked
+				if (registrationInfo) {
+					// attempt to re-login
+					attemptLogin();
+				}
+			}
+			
 			function doPresenceClick() {
 				$("#roster").slideToggle("slow");
 			}
-			
-			var HTTPBASE = "<lams:LAMSURL/>JHB";
-	
 		</script>
 		</c:if>