diff --git a/src/Core/Pages/Accounts/LockPage.xaml.cs b/src/Core/Pages/Accounts/LockPage.xaml.cs
index b90b2c04ec..ce45b6eb81 100644
--- a/src/Core/Pages/Accounts/LockPage.xaml.cs
+++ b/src/Core/Pages/Accounts/LockPage.xaml.cs
@@ -233,7 +233,10 @@ namespace Bit.App.Pages
             }
             var previousPage = await AppHelpers.ClearPreviousPage();
 
-            _appOptions.HasJustLoggedInOrUnlocked = true;
+            if (_appOptions != null)
+            {
+                _appOptions.HasJustLoggedInOrUnlocked = true;
+            }
             App.MainPage = new TabsPage(_appOptions, previousPage);
         }
     }
diff --git a/src/Core/Pages/Accounts/LoginApproveDevicePage.xaml.cs b/src/Core/Pages/Accounts/LoginApproveDevicePage.xaml.cs
index 8b46fc9e3e..f28be1485c 100644
--- a/src/Core/Pages/Accounts/LoginApproveDevicePage.xaml.cs
+++ b/src/Core/Pages/Accounts/LoginApproveDevicePage.xaml.cs
@@ -36,7 +36,10 @@ namespace Bit.App.Pages
                 return;
             }
             
-            _appOptions.HasJustLoggedInOrUnlocked = true;
+            if (_appOptions != null)
+            {
+                _appOptions.HasJustLoggedInOrUnlocked = true;
+            }
             var previousPage = await AppHelpers.ClearPreviousPage();
             App.MainPage = new TabsPage(_appOptions, previousPage);
         }
diff --git a/src/Core/Pages/Accounts/LoginPage.xaml.cs b/src/Core/Pages/Accounts/LoginPage.xaml.cs
index 434a062739..17a41cbaf4 100644
--- a/src/Core/Pages/Accounts/LoginPage.xaml.cs
+++ b/src/Core/Pages/Accounts/LoginPage.xaml.cs
@@ -196,7 +196,10 @@ namespace Bit.App.Pages
                     return;
                 }
                 
-                _appOptions.HasJustLoggedInOrUnlocked = true;
+                if (_appOptions != null)
+                {
+                    _appOptions.HasJustLoggedInOrUnlocked = true;
+                }
                 var previousPage = await AppHelpers.ClearPreviousPage();
                 App.MainPage = new TabsPage(_appOptions, previousPage);
             }
diff --git a/src/Core/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs b/src/Core/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
index f8333f9725..f1f67ccdbe 100644
--- a/src/Core/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
+++ b/src/Core/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
@@ -56,7 +56,10 @@ namespace Bit.App.Pages
                     return;
                 }
                 
-                _appOptions.HasJustLoggedInOrUnlocked = true;
+                if (_appOptions != null)
+                {
+                    _appOptions.HasJustLoggedInOrUnlocked = true;
+                }
                 var previousPage = await AppHelpers.ClearPreviousPage();
                 App.MainPage = new TabsPage(_appOptions, previousPage);
             }
diff --git a/src/Core/Pages/Accounts/SetPasswordPage.xaml.cs b/src/Core/Pages/Accounts/SetPasswordPage.xaml.cs
index 5a305cf6c5..558375dfbf 100644
--- a/src/Core/Pages/Accounts/SetPasswordPage.xaml.cs
+++ b/src/Core/Pages/Accounts/SetPasswordPage.xaml.cs
@@ -72,7 +72,10 @@ namespace Bit.App.Pages
                     return;
                 }
                 
-                _appOptions.HasJustLoggedInOrUnlocked = true;
+                if (_appOptions != null)
+                {
+                    _appOptions.HasJustLoggedInOrUnlocked = true;
+                }
                 var previousPage = await AppHelpers.ClearPreviousPage();
                 App.MainPage = new TabsPage(_appOptions, previousPage);
             }
diff --git a/src/Core/Pages/Accounts/TwoFactorPage.xaml.cs b/src/Core/Pages/Accounts/TwoFactorPage.xaml.cs
index a3dfae9767..342eefd798 100644
--- a/src/Core/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/Core/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -207,7 +207,10 @@ namespace Bit.App.Pages
                 return;
             }
 
-            _appOptions.HasJustLoggedInOrUnlocked = true;
+            if (_appOptions != null)
+            {
+                _appOptions.HasJustLoggedInOrUnlocked = true;
+            }
             var previousPage = await AppHelpers.ClearPreviousPage();
             App.MainPage = new TabsPage(_appOptions, previousPage);
         }