diff --git a/apps/browser/jslib b/apps/browser/jslib
index 2f54893854..a6fe5c7900 160000
--- a/apps/browser/jslib
+++ b/apps/browser/jslib
@@ -1 +1 @@
-Subproject commit 2f54893854da61a742f87b02ec4328f7933bfe27
+Subproject commit a6fe5c79002370d7ac8e52f2ff16154b853b7974
diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 2e1c47451d..f65da3812c 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -1961,5 +1961,8 @@
   },
   "apiKey": {
     "message": "API Key"
+  },
+  "ssoKeyConnectorError": {
+    "message": "Key Connector error: make sure Key Connector is available and working correctly."
   }
 }
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index f6c38c2af0..b94b93f2a9 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -163,6 +163,21 @@ export default class MainBackground {
 
   constructor(public isPrivateMode: boolean = false) {
     // Services
+    const lockedCallback = async (userId?: string) => {
+      if (this.notificationsService != null) {
+        this.notificationsService.updateConnection(false);
+      }
+      await this.setIcon();
+      await this.refreshBadgeAndMenu(true);
+      if (this.systemService != null) {
+        await this.systemService.clearPendingClipboard();
+        await this.reloadProcess();
+      }
+    };
+
+    const logoutCallback = async (expired: boolean, userId?: string) =>
+      await this.logout(expired, userId);
+
     this.messagingService = isPrivateMode
       ? new BrowserMessagingPrivateModeBackgroundService()
       : new BrowserMessagingService();
@@ -267,7 +282,8 @@ export default class MainBackground {
       this.tokenService,
       this.logService,
       this.organizationService,
-      this.cryptoFunctionService
+      this.cryptoFunctionService,
+      logoutCallback
     );
     this.vaultFilterService = new VaultFilterService(
       this.stateService,
@@ -304,21 +320,6 @@ export default class MainBackground {
       this.i18nService
     );
 
-    const lockedCallback = async (userId?: string) => {
-      if (this.notificationsService != null) {
-        this.notificationsService.updateConnection(false);
-      }
-      await this.setIcon();
-      await this.refreshBadgeAndMenu(true);
-      if (this.systemService != null) {
-        await this.systemService.clearPendingClipboard();
-        await this.reloadProcess();
-      }
-    };
-
-    const logoutCallback = async (expired: boolean, userId?: string) =>
-      await this.logout(expired, userId);
-
     this.vaultTimeoutService = new VaultTimeoutService(
       this.cipherService,
       this.folderService,
diff --git a/apps/cli/jslib b/apps/cli/jslib
index 1370006f6e..a6fe5c7900 160000
--- a/apps/cli/jslib
+++ b/apps/cli/jslib
@@ -1 +1 @@
-Subproject commit 1370006f6ea310cf85a12bcbd8213f74f9552c4d
+Subproject commit a6fe5c79002370d7ac8e52f2ff16154b853b7974
diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts
index cbe94e82ef..7006a18d21 100644
--- a/apps/cli/src/bw.ts
+++ b/apps/cli/src/bw.ts
@@ -228,7 +228,8 @@ export class Main {
       this.tokenService,
       this.logService,
       this.organizationService,
-      this.cryptoFunctionService
+      this.cryptoFunctionService,
+      async (expired: boolean) => await this.logout()
     );
 
     this.twoFactorService = new TwoFactorService(this.i18nService, this.platformUtilsService);
diff --git a/apps/cli/src/locales/en/messages.json b/apps/cli/src/locales/en/messages.json
index fc9cb45669..ca1e8317a8 100644
--- a/apps/cli/src/locales/en/messages.json
+++ b/apps/cli/src/locales/en/messages.json
@@ -40,5 +40,8 @@
   },
   "sessionTimeout": {
     "message": "Your session has timed out. Please go back and try logging in again."
+  },
+  "ssoKeyConnectorError": {
+    "message": "Key Connector error: make sure Key Connector is available and working correctly."
   }
 }
diff --git a/apps/desktop/jslib b/apps/desktop/jslib
index 2f54893854..a6fe5c7900 160000
--- a/apps/desktop/jslib
+++ b/apps/desktop/jslib
@@ -1 +1 @@
-Subproject commit 2f54893854da61a742f87b02ec4328f7933bfe27
+Subproject commit a6fe5c79002370d7ac8e52f2ff16154b853b7974
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 8e096e0996..a5ea4d8f76 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -1805,8 +1805,8 @@
   "leftOrganization": {
     "message": "You have left the organization."
   },
-  "ssoKeyConnectorUnavailable": {
-    "message": "Unable to reach the key connector, try again later."
+  "ssoKeyConnectorError": {
+    "message": "Key Connector error: make sure Key Connector is available and working correctly."
   },
   "lockAllVaults": {
     "message": "Lock All Vaults"