diff --git a/src/iOS.Autofill/CredentialProviderViewController.cs b/src/iOS.Autofill/CredentialProviderViewController.cs
index c42acbdb6..bdce4caee 100644
--- a/src/iOS.Autofill/CredentialProviderViewController.cs
+++ b/src/iOS.Autofill/CredentialProviderViewController.cs
@@ -99,6 +99,8 @@ namespace Bit.iOS.Autofill
 
         public void CompleteRequest(string username = null, string password = null, string totp = null)
         {
+            ServiceContainer.Reset();
+
             if((_context?.Configuring ?? true) && string.IsNullOrWhiteSpace(password))
             {
                 ExtensionContext?.CompleteExtensionConfigurationRequest();
@@ -243,15 +245,15 @@ namespace Bit.iOS.Autofill
 
         private void InitApp()
         {
-            iOSCoreHelpers.AppearanceAdjustments();
             if(ServiceContainer.RegisteredServices.Count > 0)
             {
-                return;
+                ServiceContainer.Reset();
             }
             iOSCoreHelpers.RegisterLocalServices();
             ServiceContainer.Init();
             iOSCoreHelpers.RegisterHockeyApp();
             iOSCoreHelpers.Bootstrap();
+            iOSCoreHelpers.AppearanceAdjustments();
         }
     }
 }
\ No newline at end of file
diff --git a/src/iOS.Extension/LoadingViewController.cs b/src/iOS.Extension/LoadingViewController.cs
index 7041e63b3..66ef90219 100644
--- a/src/iOS.Extension/LoadingViewController.cs
+++ b/src/iOS.Extension/LoadingViewController.cs
@@ -176,15 +176,13 @@ namespace Bit.iOS.Extension
 
         public void CompleteRequest(NSDictionary itemData)
         {
+            ServiceContainer.Reset();
+
             Debug.WriteLine("BW LOG, itemData: " + itemData);
             var resultsProvider = new NSItemProvider(itemData, UTType.PropertyList);
             var resultsItem = new NSExtensionItem { Attachments = new NSItemProvider[] { resultsProvider } };
             var returningItems = new NSExtensionItem[] { resultsItem };
-            NSRunLoop.Main.BeginInvokeOnMainThread(() =>
-            {
-                ServiceContainer.Reset();
-                ExtensionContext?.CompleteRequest(returningItems, null);
-            });
+            NSRunLoop.Main.BeginInvokeOnMainThread(() => ExtensionContext?.CompleteRequest(returningItems, null));
         }
 
         private bool ProcessItemProvider(NSItemProvider itemProvider, string type, Action<NSDictionary> dictAction,
@@ -375,15 +373,15 @@ namespace Bit.iOS.Extension
 
         private void InitApp()
         {
-            iOSCoreHelpers.AppearanceAdjustments();
             if(ServiceContainer.RegisteredServices.Count > 0)
             {
-                return;
+                ServiceContainer.Reset();
             }
             iOSCoreHelpers.RegisterLocalServices();
             ServiceContainer.Init();
             iOSCoreHelpers.RegisterHockeyApp();
             iOSCoreHelpers.Bootstrap();
+            iOSCoreHelpers.AppearanceAdjustments();
         }
 
         private bool IsLocked()