diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index aacaeb53bb..ede8c34ee7 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -454,7 +454,8 @@
 
         self.isLoggedIntoConnect = function () {
 
-            return self.connectToken() && self.connectUserId();
+            // Make sure it returns true or false
+            return (self.connectToken() && self.connectUserId()) == true;
         };
 
         self.logout = function () {
@@ -466,7 +467,7 @@
                 var apiClient = apiClients[i];
 
                 if (apiClient.accessToken()) {
-                    promises.push(apiClient.logout());
+                    promises.push(logoutOfServer(apiClient));
                 }
             }
 
@@ -506,6 +507,20 @@
             });
         };
 
+        function logoutOfServer(apiClient) {
+
+            var serverInfo = apiClient.serverInfo();
+
+            var logoutInfo = {
+                serverId: serverInfo.Id
+            };
+
+            return apiClient.logout().always(function () {
+
+                Events.trigger(self, 'localusersignedout', [logoutInfo]);
+            });
+        }
+
         function getConnectServers(credentials) {
 
             logger.log('Begin getConnectServers');