diff --git a/jslib b/jslib
index fc0d624621..b4f475251a 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit fc0d6246215f6154c2d566e44f6ddbe8eaa056e6
+Subproject commit b4f475251aa6817403117b71fb5a8836cdae9c75
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index d6d924726a..2f663cabc6 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -320,11 +320,11 @@
   "browserNotSupportClipboard": {
     "message": "Your web browser does not support easy clipboard copying. Copy it manually instead."
   },
-  "verifyMasterPassword": {
-    "message": "Verify Master Password"
+  "verifyIdentity": {
+    "message": "Verify Identity"
   },
   "yourVaultIsLocked": {
-    "message": "Your vault is locked. Verify your master password to continue."
+    "message": "Your vault is locked. Verify your identity to continue."
   },
   "unlock": {
     "message": "Unlock"
@@ -1332,12 +1332,6 @@
   "invalidPin": {
     "message": "Invalid PIN code."
   },
-  "verifyPin": {
-    "message": "Verify PIN"
-  },
-  "yourVaultIsLockedPinCode": {
-    "message": "Your vault is locked. Verify your PIN code to continue."
-  },
   "unlockWithBiometrics": {
     "message": "Unlock with biometrics"
   },
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index 1b7da04eae..603b1ef389 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -2,16 +2,16 @@
     <header>
         <div class="left"></div>
         <div class="center">
-            <span class="title">{{(pinLock ? 'verifyPin' : 'verifyMasterPassword') | i18n}}</span>
+            <span class="title">{{'verifyIdentity' | i18n}}</span>
         </div>
         <div class="right">
-            <button type="submit" appBlurClick>{{'unlock' | i18n}}</button>
+            <button type="submit" appBlurClick *ngIf="!hideInput">{{'unlock' | i18n}}</button>
         </div>
     </header>
     <content>
         <div class="box">
             <div class="box-content">
-                <div class="box-content-row box-content-row-flex" appBoxRow>
+                <div class="box-content-row box-content-row-flex" appBoxRow *ngIf="!hideInput">
                     <div class="row-main" *ngIf="pinLock">
                         <label for="pin">{{'pin' | i18n}}</label>
                         <input id="pin" type="{{showPassword ? 'text' : 'password'}}" name="PIN" class="monospaced"
@@ -32,13 +32,14 @@
                 </div>
             </div>
             <div class="box-footer">
-                <p>{{(pinLock ? 'yourVaultIsLockedPinCode' : 'yourVaultIsLocked') | i18n}}</p>
+                <p>{{'yourVaultIsLocked' | i18n}}</p>
                 {{'loggedInAsOn' | i18n : email : webVaultHostname}}
             </div>
         </div>
         <div class="box" *ngIf="biometricLock">
             <div class="box-footer">
-                <button type="button" class="btn primary block" (click)="unlockBiometric()" appStopClick>{{'unlockWithBiometrics' | i18n}}</button>
+                <button type="button" class="btn primary block" (click)="unlockBiometric()"
+                    appStopClick>{{'unlockWithBiometrics' | i18n}}</button>
             </div>
         </div>
         <p class="text-center">