diff --git a/jslib b/jslib
index d8f9177c03..fc1a73c9f2 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit d8f9177c03549667cf6d1e5f30536d010acc7b7d
+Subproject commit fc1a73c9f2ef2c18f05dfebb5cf80ce84520d118
diff --git a/src/background/main.background.ts b/src/background/main.background.ts
index d9bc9df153..1575eb7bdd 100644
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@@ -151,7 +151,7 @@ export default class MainBackground {
         this.searchService = new SearchService(this.cipherService, this.platformUtilsService);
         this.lockService = new LockService(this.cipherService, this.folderService, this.collectionService,
             this.cryptoService, this.platformUtilsService, this.storageService, this.messagingService,
-            this.searchService, async () => {
+            this.searchService, this.userService, async () => {
                 if (this.notificationsService != null) {
                     this.notificationsService.updateConnection(false);
                 }
diff --git a/src/popup/app.component.ts b/src/popup/app.component.ts
index 46ff36ab27..2a29f979ce 100644
--- a/src/popup/app.component.ts
+++ b/src/popup/app.component.ts
@@ -101,6 +101,9 @@ export class AppComponent implements OnInit {
                 });
             } else if (msg.command === 'locked') {
                 this.stateService.purge();
+                this.ngZone.run(() => {
+                    this.router.navigate(['lock']);
+                });
             } else if (msg.command === 'showDialog') {
                 await this.showDialog(msg);
             } else if (msg.command === 'showToast') {
diff --git a/src/popup/settings/settings.component.ts b/src/popup/settings/settings.component.ts
index f236eafe22..2fb9752105 100644
--- a/src/popup/settings/settings.component.ts
+++ b/src/popup/settings/settings.component.ts
@@ -167,7 +167,6 @@ export class SettingsComponent implements OnInit {
     async lock() {
         this.analytics.eventTrack.next({ action: 'Lock Now' });
         await this.lockService.lock(true);
-        this.router.navigate(['lock']);
     }
 
     async logOut() {