diff --git a/jslib b/jslib
index 8b01eea4..f4c66b2c 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 8b01eea4467a8b1d411dab44d9a9b9a66a0ad341
+Subproject commit f4c66b2c8c243935bf25f689b16afaa5d6345f1b
diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index e4c48cfb..33584c85 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -1,10 +1,10 @@
 <form id="lock-page" (ngSubmit)="submit()">
     <div class="content">
         <p aria-hidden="true"><i class="fa fa-lock fa-4x text-muted"></i></p>
-        <p>{{(pinLock ? 'yourVaultIsLockedPinCode' : 'yourVaultIsLocked') | i18n}}</p>
+        <p>{{'yourVaultIsLocked' | i18n}}</p>
         <div class="box last">
             <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"
@@ -29,19 +29,20 @@
             </div>
         </div>
         <div class="buttons with-rows">
+            <div class="buttons-row" *ngIf="supportsBiometric && biometricLock">
+                <button type="button" class="btn block" [ngClass]="{'primary font-weight-bold': hideInput}"
+                    appBlurClick (click)="unlockBiometric()">
+                    {{biometricText | i18n}}
+                </button>
+            </div>
             <div class="buttons-row">
-                <button type="submit" class="btn primary block" appBlurClick>
+                <button type="submit" class="btn primary block" appBlurClick *ngIf="!hideInput">
                     <i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{'unlock' | i18n}}</b>
                 </button>
                 <button type="button" class="btn block" appBlurClick (click)="logOut()">
                     {{'logOut' | i18n}}
                 </button>
             </div>
-            <div class="buttons-row" *ngIf="supportsBiometric && biometricLock">
-                <button type="button" class="btn block" appBlurClick (click)="unlockBiometric()">
-                    {{biometricText | i18n}}
-                </button>
-            </div>
         </div>
     </div>
 </form>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 3b9cb143..d9eee019 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -787,7 +787,7 @@
     "message": "Syncing failed"
   },
   "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"
@@ -1315,9 +1315,6 @@
   "invalidPin": {
     "message": "Invalid PIN code."
   },
-  "yourVaultIsLockedPinCode": {
-    "message": "Your vault is locked. Verify your PIN code to continue."
-  },
   "unlockWithWindowsHello": {
     "message": "Unlock with Windows Hello"
   },
diff --git a/src/scss/misc.scss b/src/scss/misc.scss
index d9699e81..9e9b2ab9 100644
--- a/src/scss/misc.scss
+++ b/src/scss/misc.scss
@@ -96,6 +96,10 @@ p.lead {
     white-space: pre-wrap;
 }
 
+.font-weight-bold {
+    font-weight: bold;
+}
+
 .sr-only {
     position: absolute !important;
     width: 1px !important;