diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
index 69def55ce..b175677a5 100644
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -88,7 +88,8 @@ namespace Bit.Droid
             {
                 if(message.Command == "scheduleLockTimer")
                 {
-                    var lockOptionMs = (int)message.Data * 1000;
+                    var lockOptionMinutes = (int)message.Data;
+                    var lockOptionMs = lockOptionMinutes * 60000;
                     var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + lockOptionMs + 10;
                     var alarmManager = GetSystemService(AlarmService) as AlarmManager;
                     alarmManager.Set(AlarmType.RtcWakeup, triggerMs, _lockAlarmPendingIntent);
diff --git a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
index 27598928d..bf4c27a5f 100644
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -275,6 +275,7 @@ namespace Bit.App.Pages
             {
                 await _storageService.RemoveAsync(Constants.FingerprintUnlockKey);
             }
+            _lockService.FingerprintLocked = false;
             await _cryptoService.ToggleKeyAsync();
             BuildList();
         }