diff --git a/src/App/Pages/Accounts/LoginPageViewModel.cs b/src/App/Pages/Accounts/LoginPageViewModel.cs
index 713599a9a..734c4464f 100644
--- a/src/App/Pages/Accounts/LoginPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPageViewModel.cs
@@ -91,6 +91,7 @@ namespace Bit.App.Pages
                 return;
             }
 
+            ShowPassword = false;
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.LoggingIn);
diff --git a/src/App/Pages/Settings/OptionsPageViewModel.cs b/src/App/Pages/Settings/OptionsPageViewModel.cs
index 17c79a015..6d01743fa 100644
--- a/src/App/Pages/Settings/OptionsPageViewModel.cs
+++ b/src/App/Pages/Settings/OptionsPageViewModel.cs
@@ -188,7 +188,8 @@ namespace Bit.App.Pages
         {
             if(_inited && UriMatchSelectedIndex > -1)
             {
-                await _storageService.SaveAsync(Constants.DefaultUriMatch, UriMatchOptions[UriMatchSelectedIndex].Key);
+                await _storageService.SaveAsync(Constants.DefaultUriMatch,
+                    (int?)UriMatchOptions[UriMatchSelectedIndex].Key);
             }
         }
     }