From a3922f7fbbec15ba9a1830ea56c001f643102536 Mon Sep 17 00:00:00 2001
From: Matt Portune <mportune@bitwarden.com>
Date: Tue, 18 Jan 2022 17:21:24 -0500
Subject: [PATCH] fixes

---
 src/App/App.xaml.cs             | 2 +-
 src/App/Utilities/AppHelpers.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/App/App.xaml.cs b/src/App/App.xaml.cs
index 8a337828c..ccd40109c 100644
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -270,11 +270,11 @@ namespace Bit.App
         private async Task SwitchedAccountAsync()
         {
             await AppHelpers.OnAccountSwitchAsync();
-            UpdateTheme();
             Device.BeginInvokeOnMainThread(async () =>
             {
                 await SetMainPageAsync();
             });
+            UpdateTheme();
         }
 
         private async Task SetMainPageAsync()
diff --git a/src/App/Utilities/AppHelpers.cs b/src/App/Utilities/AppHelpers.cs
index 2ad48dca3..488c44db0 100644
--- a/src/App/Utilities/AppHelpers.cs
+++ b/src/App/Utilities/AppHelpers.cs
@@ -498,6 +498,7 @@ namespace Bit.App.Utilities
             var environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
             var tokenService = ServiceContainer.Resolve<ITokenService>("tokenService");
             var cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
+            var settingsService = ServiceContainer.Resolve<ISettingsService>("settingsService");
             var cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
             var folderService = ServiceContainer.Resolve<IFolderService>("folderService");
             var collectionService = ServiceContainer.Resolve<ICollectionService>("collectionService");
@@ -513,6 +514,7 @@ namespace Bit.App.Utilities
                 deviceActionService.ClearCacheAsync());
             tokenService.ClearCache();
             cryptoService.ClearCache();
+            settingsService.ClearCache();
             folderService.ClearCache();
             collectionService.ClearCache();
             passwordGenerationService.ClearCache();