diff --git a/src/App/Pages/Accounts/LoginSsoPage.xaml.cs b/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
index 675676bcd0e..c30853d2c76 100644
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
@@ -93,14 +93,14 @@ private void Close_Clicked(object sender, EventArgs e)
         private async Task StartTwoFactorAsync()
         {
             RestoreAppOptionsFromCopy();
-            var page = new TwoFactorPage(true, _appOptions);
+            var page = new TwoFactorPage(true, _appOptions, _vm.OrgIdentifier);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
 
         private async Task StartSetPasswordAsync()
         {
             RestoreAppOptionsFromCopy();
-            var page = new SetPasswordPage(_appOptions);
+            var page = new SetPasswordPage(_appOptions, _vm.OrgIdentifier);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
 
diff --git a/src/App/Pages/Accounts/SetPasswordPage.xaml.cs b/src/App/Pages/Accounts/SetPasswordPage.xaml.cs
index 8b351d35a24..6f7d3c82b2d 100644
--- a/src/App/Pages/Accounts/SetPasswordPage.xaml.cs
+++ b/src/App/Pages/Accounts/SetPasswordPage.xaml.cs
@@ -14,7 +14,7 @@ public partial class SetPasswordPage : BaseContentPage
         private readonly SetPasswordPageViewModel _vm;
         private readonly AppOptions _appOptions;
 
-        public SetPasswordPage(AppOptions appOptions = null)
+        public SetPasswordPage(AppOptions appOptions = null, string orgIdentifier = null)
         {
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _messagingService.Send("showStatusBar", true);
@@ -29,6 +29,7 @@ public SetPasswordPage(AppOptions appOptions = null)
                 _messagingService.Send("showStatusBar", false);
                 await Navigation.PopModalAsync();
             };
+            _vm.OrgIdentifier = orgIdentifier;
             if (Device.RuntimePlatform == Device.Android)
             {
                 ToolbarItems.RemoveAt(0);
diff --git a/src/App/Pages/Accounts/SetPasswordPageViewModel.cs b/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
index be7f7d5b66f..815a7ccd410 100644
--- a/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
+++ b/src/App/Pages/Accounts/SetPasswordPageViewModel.cs
@@ -85,6 +85,7 @@ public MasterPasswordPolicyOptions Policy
         public string Hint { get; set; }
         public Action SetPasswordSuccessAction { get; set; }
         public Action CloseAction { get; set; }
+        public string OrgIdentifier { get; set; }
 
         public async Task InitAsync()
         {
@@ -158,6 +159,7 @@ await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
                 MasterPasswordHint = Hint,
                 Kdf = kdf,
                 KdfIterations = kdfIterations,
+                OrgIdentifier = OrgIdentifier,
                 Keys = new KeysRequest
                 {
                     PublicKey = keys.Item1,
diff --git a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
index 3d7a3b2e285..2dd87b16b8c 100644
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml.cs
@@ -20,13 +20,15 @@ public partial class TwoFactorPage : BaseContentPage
         private TwoFactorPageViewModel _vm;
         private bool _inited;
         private bool _authingWithSso;
+        private string _orgIdentifier;
 
-        public TwoFactorPage(bool? authingWithSso = false, AppOptions appOptions = null)
+        public TwoFactorPage(bool? authingWithSso = false, AppOptions appOptions = null, string orgIdentifier = null)
         {
             InitializeComponent();
             SetActivityIndicator();
             _authingWithSso = authingWithSso ?? false;
             _appOptions = appOptions;
+            _orgIdentifier = orgIdentifier;
             _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
@@ -170,7 +172,7 @@ private void TryAgain_Clicked(object sender, EventArgs e)
         private async Task StartSetPasswordAsync()
         {
             _vm.CloseAction();
-            var page = new SetPasswordPage(_appOptions);
+            var page = new SetPasswordPage(_appOptions, _orgIdentifier);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
 
diff --git a/src/Core/Models/Request/SetPasswordRequest.cs b/src/Core/Models/Request/SetPasswordRequest.cs
index 5682af3cef7..28db2ab4ee0 100644
--- a/src/Core/Models/Request/SetPasswordRequest.cs
+++ b/src/Core/Models/Request/SetPasswordRequest.cs
@@ -10,5 +10,6 @@ public class SetPasswordRequest
         public KeysRequest Keys { get; set; }
         public KdfType Kdf { get; set; }
         public int KdfIterations { get; set; }
+        public string OrgIdentifier { get; set; }
     }
 }