From 2ddf624f7d06030a062e9234b59ce28133fb4c52 Mon Sep 17 00:00:00 2001
From: Matt Portune <59324545+mportune-bw@users.noreply.github.com>
Date: Wed, 23 Sep 2020 09:02:20 -0400
Subject: [PATCH] fix for sso login when bio unlock already enabled (#1086)

---
 src/App/Pages/Accounts/LockPageViewModel.cs | 2 +-
 src/Core/Services/CryptoService.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App/Pages/Accounts/LockPageViewModel.cs b/src/App/Pages/Accounts/LockPageViewModel.cs
index 44974a2ea..b8aac7a6c 100644
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -116,7 +116,7 @@ namespace Bit.App.Pages
         {
             _pinSet = await _vaultTimeoutService.IsPinLockSetAsync();
             PinLock = (_pinSet.Item1 && _vaultTimeoutService.PinProtectedKey != null) || _pinSet.Item2;
-            BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync();
+            BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _cryptoService.HasKeyAsync();
             _email = await _userService.GetEmailAsync();
             var webVault = _environmentService.GetWebVaultUrl();
             if (string.IsNullOrWhiteSpace(webVault))
diff --git a/src/Core/Services/CryptoService.cs b/src/Core/Services/CryptoService.cs
index 92929aeee..681bbd1aa 100644
--- a/src/Core/Services/CryptoService.cs
+++ b/src/Core/Services/CryptoService.cs
@@ -54,7 +54,7 @@ namespace Bit.Core.Services
                 // If we have a lock option set, we do not store the key
                 return;
             }
-            await _secureStorageService.SaveAsync(Keys_Key, key.KeyB64);
+            await _secureStorageService.SaveAsync(Keys_Key, key?.KeyB64);
         }
 
         public async Task SetKeyHashAsync(string keyHash)