diff --git a/jslib b/jslib
index c62f5287cd..419215fca1 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit c62f5287cd259c6385c6e79193e0e5e1746c7a3c
+Subproject commit 419215fca153fb0686e6d90cc1effd5c21be247d
diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index 1f8dd4507d..46972574a3 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -28,18 +28,20 @@
                 {{'loggedInAsOn' | i18n : email : webVaultHostname}}
             </div>
         </div>
-        <div class="buttons">
-            <button type="submit" class="btn primary block" appBlurClick>
-                <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="button" *ngIf="supportsBiometric && biometricLock">
-            <a class="btn primary block" appBlurClick (click)="unlockBiometric()">
-                <i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{biometricText | i18n}}</b>
-            </a>
+        <div class="buttons with-rows">
+            <div class="buttons-row">
+                <button type="submit" class="btn primary block" appBlurClick>
+                    <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">
+                <a class="btn block" appBlurClick (click)="unlockBiometric()">
+                    {{biometricText | i18n}}
+                </a>
+            </div>
         </div>
     </div>
 </form>
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 125b2a3ed4..33b6d5ae80 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -1,5 +1,8 @@
 import { Component } from '@angular/core';
-import { Router } from '@angular/router';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
 
 import { ApiService } from 'jslib/abstractions/api.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
@@ -23,8 +26,18 @@ export class LockComponent extends BaseLockComponent {
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService,
         storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
-        environmentService: EnvironmentService, stateService: StateService, apiService: ApiService) {
+        environmentService: EnvironmentService, stateService: StateService,
+        apiService: ApiService, private route: ActivatedRoute) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
             storageService, vaultTimeoutService, environmentService, stateService, apiService);
     }
+
+    async ngOnInit() {
+        await super.ngOnInit();
+        this.route.queryParams.subscribe((params) => {
+            if (this.supportsBiometric && params.promptBiometric) {
+                setTimeout(() => this.unlockBiometric(), 1000);
+            }
+        });
+    }
 }
diff --git a/src/package.json b/src/package.json
index 2eb5721434..9e0a648765 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,10 +13,12 @@
   },
   "dependencies": {
     "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
+    "big-integer": "1.6.36",
     "desktop-idle": "1.1.2",
     "electron-log": "2.2.17",
     "electron-store": "1.3.0",
     "electron-updater": "4.2.0",
-    "keytar": "4.13.0"
+    "keytar": "4.13.0",
+    "zxcvbn": "4.4.2"
   }
 }
diff --git a/src/scss/pages.scss b/src/scss/pages.scss
index 30925cfb06..bcda0725f8 100644
--- a/src/scss/pages.scss
+++ b/src/scss/pages.scss
@@ -63,8 +63,14 @@
         }
 
         .buttons {
-            display: flex;
-            margin-bottom: 20px;
+            &:not(.with-rows), .buttons-row {
+                display: flex;
+                margin-bottom: 10px;
+            }
+
+            &:not(.with-rows), .buttons-row:last-child {
+                margin-bottom: 20px;
+            }
 
             button {
                 margin-right: 10px;