diff --git a/app/assets/javascripts/AAB_message_factory.js b/app/assets/javascripts/AAB_message_factory.js
index 5c31c0a79..76f08b556 100644
--- a/app/assets/javascripts/AAB_message_factory.js
+++ b/app/assets/javascripts/AAB_message_factory.js
@@ -69,7 +69,10 @@
 
     // create a login message using token (a cookie or similiar)
     factory.login_with_token = function(token) {
-        var login = { token : token };
+	//context.JK.logger.debug("*** login_with_token: client_id = "+$.cookie("client_id"));
+        var login = { token : token,
+		      client_id : $.cookie("client_id")
+		    };
         return client_container(msg.LOGIN, route_to.SERVER, login);
     };
 
diff --git a/app/assets/javascripts/jamkazam.js b/app/assets/javascripts/jamkazam.js
index be974d1de..969c0b47f 100644
--- a/app/assets/javascripts/jamkazam.js
+++ b/app/assets/javascripts/jamkazam.js
@@ -51,6 +51,7 @@
 
         function loggedIn(header, payload) {
             app.clientId = payload.client_id;
+	    $.cookie('client_id', payload.client_id);
             var heartbeatMS = payload.heartbeat_interval * 1000;
             logger.debug("jamkazam.js.loggedIn(): clientId now " + app.clientId + "; Setting up heartbeat every " + heartbeatMS + " MS");
             heartbeatInterval = context.setInterval(_heartbeat, heartbeatMS);