diff --git a/jslib b/jslib
index e7464785e1..f3f17138c8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e7464785e134e5d723a4901cf54c5dd1668efb5c
+Subproject commit f3f17138c82b59a65c68cc2c20d8bb6112192743
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index eb90c02d55..fefae69450 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -295,6 +295,21 @@
   "verifyMasterPassword": {
     "message": "Verify Master Password"
   },
+  "yourVaultIsLocked": {
+    "message": "Your vault is locked. Verify your master password to continue."
+  },
+  "unlock": {
+    "message": "Unlock"
+  },
+  "loggedInAs": {
+    "message": "Currently logged in as $EMAIL$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index 7cd46d44b6..fac87de88a 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -5,7 +5,7 @@
             <span class="title">{{'verifyMasterPassword' | i18n}}</span>
         </div>
         <div class="right">
-            <button type="submit" appBlurClick>{{'submit' | i18n}}</button>
+            <button type="submit" appBlurClick>{{'unlock' | i18n}}</button>
         </div>
     </header>
     <content>
@@ -26,6 +26,10 @@
                     </div>
                 </div>
             </div>
+            <div class="box-footer">
+                <p>{{'yourVaultIsLocked' | i18n}}</p>
+                {{'loggedInAs' | i18n : email}}
+            </div>
         </div>
         <p class="text-center">
             <a href="#" appStopClick (click)="logOut()">{{'logOut' | i18n}}</a>
diff --git a/src/popup/accounts/lock.component.ts b/src/popup/accounts/lock.component.ts
index 54da2f0109..6b1f276ba5 100644
--- a/src/popup/accounts/lock.component.ts
+++ b/src/popup/accounts/lock.component.ts
@@ -1,7 +1,4 @@
-import {
-    Component,
-    OnInit,
-} from '@angular/core';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { CryptoService } from 'jslib/abstractions/crypto.service';
@@ -16,7 +13,7 @@ import { LockComponent as BaseLockComponent } from 'jslib/angular/components/loc
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
 })
-export class LockComponent extends BaseLockComponent implements OnInit {
+export class LockComponent extends BaseLockComponent {
     constructor(router: Router, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService) {
@@ -24,7 +21,8 @@ export class LockComponent extends BaseLockComponent implements OnInit {
         this.successRoute = '/tabs/current';
     }
 
-    ngOnInit() {
+    async ngOnInit() {
+        await super.ngOnInit();
         window.setTimeout(() => {
             document.getElementById('masterPassword').focus();
         }, 100);