diff --git a/web/app/assets/javascripts/JamServer.js b/web/app/assets/javascripts/JamServer.js
index fdaeea6f7..cce25f6da 100644
--- a/web/app/assets/javascripts/JamServer.js
+++ b/web/app/assets/javascripts/JamServer.js
@@ -189,6 +189,15 @@
 
     function loggedIn(header, payload) {
 
+      server.signedIn = true;
+      server.clientID = payload.client_id;
+      server.publicIP = payload.public_ip;
+
+      if (context.jamClient !== undefined) {
+        context.jamClient.connected = true;
+        context.jamClient.clientID = server.clientID;
+      }
+
       clearConnectTimeout();
 
       heartbeatStateReset();
@@ -197,7 +206,7 @@
 
       if(isClientMode()) {
         // tell the backend that we have logged in
-        context.jamClient.OnLoggedIn(payload.user_id, payload.token);
+        context.jamClient.OnLoggedIn(payload.user_id, payload.token); // ACTS AS CONTINUATION
         $.cookie('client_id', payload.client_id);
       }
 
@@ -205,12 +214,14 @@
       // where there is no device on startup for the current profile.
       // So, in that case, it's possible that a reconnect loop will attempt, but we *do not want*
       // it to go through unless we've passed through .OnLoggedIn
+      server.connected = true;
+      server.reconnecting = false;
       server.connecting = false;
       initialConnectAttempt = false;
 
       heartbeatMS = payload.heartbeat_interval * 1000;
       connection_expire_time = payload.connection_expire_time * 1000;
-      logger.info("jamkazam.js.loggedIn(): clientId=" + app.clientId + ", heartbeat=" + payload.heartbeat_interval + "s, expire_time=" + payload.connection_expire_time + 's');
+      logger.info("loggedIn(): clientId=" + app.clientId + " heartbeat=" + payload.heartbeat_interval + "s expire_time=" + payload.connection_expire_time + 's');
       heartbeatInterval = context.setInterval(_heartbeat, heartbeatMS);
       heartbeatAckCheckInterval = context.setInterval(_heartbeatAckCheck, 1000);
       lastHeartbeatAckTime = new Date(new Date().getTime() + heartbeatMS); // add a little forgiveness to server for initial heartbeat
@@ -664,23 +675,6 @@
       }
     }
 
-    // Message callbacks
-    server.registerMessageCallback(context.JK.MessageType.LOGIN_ACK, function (header, payload) {
-      server.signedIn = true;
-      logger.debug("Handling LOGIN_ACK. Updating client id to " + payload.client_id);
-      server.clientID = payload.client_id;
-      server.publicIP = payload.public_ip;
-      server.connected = true;
-      server.reconnecting = false;
-
-      if (context.jamClient !== undefined) {
-        logger.info("... (handling LOGIN_ACK) Updating backend client, connected to true and clientID to " +
-          payload.client_id);
-        context.jamClient.connected = true;
-        context.jamClient.clientID = server.clientID;
-      }
-    });
-
     server.registerMessageCallback(context.JK.MessageType.PEER_MESSAGE, function (header, payload) {
       if (context.jamClient !== undefined) {
         context.jamClient.P2PMessageReceived(header.from, payload.message);