diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3191d515732..5e06fa5de84 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,6 +6,8 @@
 # Unless a later match takes precedence
 # @bitwarden/tech-leads
 
+@bitwarden/dept-development-mobile
+
 ## Auth team files ##
 
 ## Platform team files ##
diff --git a/src/Android/Autofill/AutofillHelpers.cs b/src/Android/Autofill/AutofillHelpers.cs
index 3d12f8c97a1..86d6cc82822 100644
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -20,6 +20,7 @@
 using Bit.Core.Abstractions;
 using SaveFlags = Android.Service.Autofill.SaveFlags;
 using Bit.Droid.Utilities;
+using Bit.Core.Services;
 
 namespace Bit.Droid.Autofill
 {
@@ -152,8 +153,9 @@ public static class AutofillHelpers
             "androidapp://com.oneplus.applocker",
         };
 
-        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService)
+        public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICipherService cipherService, IUserVerificationService userVerificationService)
         {
+            var userHasMasterPassword = await userVerificationService.HasMasterPasswordAsync();
             if (parser.FieldCollection.FillableForLogin)
             {
                 var ciphers = await cipherService.GetAllDecryptedByUrlAsync(parser.Uri);
@@ -161,14 +163,14 @@ public static async Task<List<FilledItem>> GetFillItemsAsync(Parser parser, ICip
                 {
                     var allCiphers = ciphers.Item1.ToList();
                     allCiphers.AddRange(ciphers.Item2.ToList());
-                    var nonPromptCiphers = allCiphers.Where(cipher => cipher.Reprompt == CipherRepromptType.None);
+                    var nonPromptCiphers = allCiphers.Where(cipher => !userHasMasterPassword || cipher.Reprompt == CipherRepromptType.None);
                     return nonPromptCiphers.Select(c => new FilledItem(c)).ToList();
                 }
             }
             else if (parser.FieldCollection.FillableForCard)
             {
                 var ciphers = await cipherService.GetAllDecryptedAsync();
-                return ciphers.Where(c => c.Type == CipherType.Card && c.Reprompt == CipherRepromptType.None).Select(c => new FilledItem(c)).ToList();
+                return ciphers.Where(c => c.Type == CipherType.Card && (!userHasMasterPassword || c.Reprompt == CipherRepromptType.None)).Select(c => new FilledItem(c)).ToList();
             }
             return new List<FilledItem>();
         }
diff --git a/src/Android/Autofill/AutofillService.cs b/src/Android/Autofill/AutofillService.cs
index 3becfe4ac03..15e384839cb 100644
--- a/src/Android/Autofill/AutofillService.cs
+++ b/src/Android/Autofill/AutofillService.cs
@@ -11,6 +11,7 @@
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 
 namespace Bit.Droid.Autofill
@@ -26,6 +27,7 @@ public class AutofillService : Android.Service.Autofill.AutofillService
         private IPolicyService _policyService;
         private IStateService _stateService;
         private LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
+        private IUserVerificationService _userVerificationService;
 
         public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
             FillCallback callback)
@@ -64,11 +66,9 @@ public async override void OnFillRequest(FillRequest request, CancellationSignal
                 var locked = await _vaultTimeoutService.IsLockedAsync();
                 if (!locked)
                 {
-                    if (_cipherService == null)
-                    {
-                        _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
-                    }
-                    items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService);
+                    _cipherService ??= ServiceContainer.Resolve<ICipherService>();
+                    _userVerificationService ??=  ServiceContainer.Resolve<IUserVerificationService>();
+                    items = await AutofillHelpers.GetFillItemsAsync(parser, _cipherService, _userVerificationService);
                 }
 
                 // build response
diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml
index 2c688b83d31..62208bf8b0e 100644
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.8.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.9.2" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
diff --git a/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs b/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
index 45e2f24552c..2cc33d54a01 100644
--- a/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
+++ b/src/App/Controls/AccountViewCell/AccountViewCellViewModel.cs
@@ -36,7 +36,7 @@ public bool IsAccount
 
         public bool ShowHostname
         {
-            get => !string.IsNullOrWhiteSpace(AccountView.Hostname) && AccountView.Hostname != "vault.bitwarden.com";
+            get => !string.IsNullOrWhiteSpace(AccountView.Hostname);
         }
 
         public bool IsActive
diff --git a/src/App/Pages/Accounts/LockPageViewModel.cs b/src/App/Pages/Accounts/LockPageViewModel.cs
index 3e6946c6ae5..c5aaf1ab769 100644
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -7,6 +7,7 @@
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
 using Bit.Core.Services;
@@ -72,11 +73,12 @@ public LockPageViewModel()
             TogglePasswordCommand = new Command(TogglePassword);
             SubmitCommand = new Command(async () => await SubmitAsync());
 
-            AccountSwitchingOverlayViewModel = new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
-            {
-                AllowAddAccountRow = true,
-                AllowActiveAccountSelection = true
-            };
+            AccountSwitchingOverlayViewModel =
+                new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
+                {
+                    AllowAddAccountRow = true,
+                    AllowActiveAccountSelection = true
+                };
         }
 
         public string MasterPassword
@@ -155,8 +157,12 @@ public string LockedVerifyText
 
         public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
+
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
-        public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
+        public string PasswordVisibilityAccessibilityText => ShowPassword
+            ? AppResources.PasswordIsVisibleTapToHide
+            : AppResources.PasswordIsNotVisibleTapToShow;
+
         public Action UnlockedAction { get; set; }
         public event Action<int?> FocusSecretEntry
         {
@@ -178,8 +184,9 @@ public async Task InitAsync()
             var ephemeralPinSet = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync()
                 ?? await _stateService.GetPinProtectedKeyAsync();
             PinEnabled = (_pinStatus == PinLockType.Transient && ephemeralPinSet != null) ||
-                      _pinStatus == PinLockType.Persistent;
-            BiometricEnabled = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _biometricService.CanUseBiometricsUnlockAsync();
+                _pinStatus == PinLockType.Persistent;
+
+            BiometricEnabled = await IsBiometricsEnabledAsync();
 
             // Users without MP and without biometric or pin has no MP to unlock with
             _hasMasterPassword = await _userVerificationService.HasMasterPasswordAsync();
@@ -214,7 +221,9 @@ public async Task InitAsync()
             else
             {
                 PageTitle = _hasMasterPassword ? AppResources.VerifyMasterPassword : AppResources.UnlockVault;
-                LockedVerifyText = _hasMasterPassword ? AppResources.VaultLockedMasterPassword : AppResources.VaultLockedIdentity;
+                LockedVerifyText = _hasMasterPassword
+                    ? AppResources.VaultLockedMasterPassword
+                    : AppResources.VaultLockedIdentity;
             }
 
             if (BiometricEnabled)
@@ -233,163 +242,198 @@ public async Task InitAsync()
                     BiometricButtonText = supportsFace ? AppResources.UseFaceIDToUnlock :
                         AppResources.UseFingerprintToUnlock;
                 }
-
             }
         }
 
         public async Task SubmitAsync()
         {
-            if (PinEnabled && string.IsNullOrWhiteSpace(Pin))
+            ShowPassword = false;
+            try
             {
-                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
-                    string.Format(AppResources.ValidationFieldRequired, AppResources.PIN),
-                    AppResources.Ok);
-                return;
+                var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
+                if (PinEnabled)
+                {
+                    await UnlockWithPinAsync(kdfConfig);
+                }
+                else
+                {
+                    await UnlockWithMasterPasswordAsync(kdfConfig);
+                }
+
             }
-            if (!PinEnabled && string.IsNullOrWhiteSpace(MasterPassword))
+            catch (LegacyUserException)
+            {
+                await HandleLegacyUserAsync();
+            }
+        }
+
+        private async Task UnlockWithPinAsync(KdfConfig kdfConfig)
+        {
+            if (PinEnabled && string.IsNullOrWhiteSpace(Pin))
             {
                 await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
-                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
+                    string.Format(AppResources.ValidationFieldRequired, AppResources.PIN),
                     AppResources.Ok);
                 return;
             }
 
-            ShowPassword = false;
-            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
-
-            if (PinEnabled)
+            var failed = true;
+            try
             {
-                var failed = true;
-                try
+                EncString userKeyPin;
+                EncString oldPinProtected;
+                switch (_pinStatus)
                 {
-                    EncString userKeyPin = null;
-                    EncString oldPinProtected = null;
-                    if (_pinStatus == PinLockType.Persistent)
-                    {
-                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
-                        var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
-                        oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
-                    }
-                    else if (_pinStatus == PinLockType.Transient)
-                    {
+                    case PinLockType.Persistent:
+                        {
+                            userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
+                            var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
+                            oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
+                            break;
+                        }
+                    case PinLockType.Transient:
                         userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
                         oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
-                    }
-
-                    UserKey userKey;
-                    if (oldPinProtected != null)
-                    {
-                        userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
-                            _pinStatus == PinLockType.Transient,
-                            Pin,
-                            _email,
-                            kdfConfig,
-                            oldPinProtected
-                        );
-                    }
-                    else
-                    {
-                        userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
-                            Pin,
-                            _email,
-                            kdfConfig,
-                            userKeyPin
-                        );
-                    }
-
-                    var protectedPin = await _stateService.GetProtectedPinAsync();
-                    var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
-                    failed = decryptedPin != Pin;
-                    if (!failed)
-                    {
-                        Pin = string.Empty;
-                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                        await SetUserKeyAndContinueAsync(userKey);
-                    }
+                        break;
+                    case PinLockType.Disabled:
+                    default:
+                        throw new Exception("Pin is disabled");
+                }
+
+                UserKey userKey;
+                if (oldPinProtected != null)
+                {
+                    userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
+                        _pinStatus == PinLockType.Transient,
+                        Pin,
+                        _email,
+                        kdfConfig,
+                        oldPinProtected
+                    );
                 }
-                catch
+                else
                 {
-                    failed = true;
+                    userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
+                        Pin,
+                        _email,
+                        kdfConfig,
+                        userKeyPin
+                    );
                 }
-                if (failed)
+
+                var protectedPin = await _stateService.GetProtectedPinAsync();
+                var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
+                failed = decryptedPin != Pin;
+                if (!failed)
                 {
-                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
-                    if (invalidUnlockAttempts >= 5)
-                    {
-                        _messagingService.Send("logout");
-                        return;
-                    }
-                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidPIN,
-                        AppResources.AnErrorHasOccurred);
+                    Pin = string.Empty;
+                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                    await SetUserKeyAndContinueAsync(userKey);
                 }
             }
+            catch (LegacyUserException)
+            {
+                throw;
+            }
+            catch
+            {
+                failed = true;
+            }
+            if (failed)
+            {
+                var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+                if (invalidUnlockAttempts >= 5)
+                {
+                    _messagingService.Send("logout");
+                    return;
+                }
+                await _platformUtilsService.ShowDialogAsync(AppResources.InvalidPIN,
+                    AppResources.AnErrorHasOccurred);
+            }
+        }
+
+        private async Task UnlockWithMasterPasswordAsync(KdfConfig kdfConfig)
+        {
+            if (!PinEnabled && string.IsNullOrWhiteSpace(MasterPassword))
+            {
+                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
+                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
+                    AppResources.Ok);
+                return;
+            }
+
+            var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, _email, kdfConfig);
+            if (await _cryptoService.IsLegacyUserAsync(masterKey))
+            {
+                throw new LegacyUserException();
+            }
+
+            var storedKeyHash = await _cryptoService.GetMasterKeyHashAsync();
+            var passwordValid = false;
+            MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;
+
+            if (storedKeyHash != null)
+            {
+                // Offline unlock possible
+                passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, masterKey);
+            }
             else
             {
-                var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, _email, kdfConfig);
-                var storedKeyHash = await _cryptoService.GetMasterKeyHashAsync();
-                var passwordValid = false;
-                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;
+                // Online unlock required
+                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
+                var keyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey,
+                    HashPurpose.ServerAuthorization);
+                var request = new PasswordVerificationRequest();
+                request.MasterPasswordHash = keyHash;
 
-                if (storedKeyHash != null)
+                try
                 {
-                    // Offline unlock possible
-                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, masterKey);
+                    var response = await _apiService.PostAccountVerifyPasswordAsync(request);
+                    enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
+                    passwordValid = true;
+                    var localKeyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey,
+                        HashPurpose.LocalAuthorization);
+                    await _cryptoService.SetMasterKeyHashAsync(localKeyHash);
                 }
-                else
+                catch (Exception e)
                 {
-                    // Online unlock required
-                    await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                    var keyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.ServerAuthorization);
-                    var request = new PasswordVerificationRequest();
-                    request.MasterPasswordHash = keyHash;
-
-                    try
-                    {
-                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
-                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
-                        passwordValid = true;
-                        var localKeyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.LocalAuthorization);
-                        await _cryptoService.SetMasterKeyHashAsync(localKeyHash);
-                    }
-                    catch (Exception e)
-                    {
-                        System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
-                    }
-                    await _deviceActionService.HideLoadingAsync();
+                    System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", e.GetType(), e.StackTrace);
                 }
-                if (passwordValid)
+                await _deviceActionService.HideLoadingAsync();
+            }
+
+            if (passwordValid)
+            {
+                if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
                 {
-                    if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
-                    {
-                        // Save the ForcePasswordResetReason to force a password reset after unlock
-                        await _stateService.SetForcePasswordResetReasonAsync(
-                            ForcePasswordResetReason.WeakMasterPasswordOnLogin);
-                    }
-
-                    MasterPassword = string.Empty;
-                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                    // Save the ForcePasswordResetReason to force a password reset after unlock
+                    await _stateService.SetForcePasswordResetReasonAsync(
+                        ForcePasswordResetReason.WeakMasterPasswordOnLogin);
+                }
 
-                    var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
-                    await _cryptoService.SetMasterKeyAsync(masterKey);
-                    await SetUserKeyAndContinueAsync(userKey);
+                MasterPassword = string.Empty;
+                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
 
-                    // Re-enable biometrics
-                    if (BiometricEnabled & !BiometricIntegrityValid)
-                    {
-                        await _biometricService.SetupBiometricAsync();
-                    }
+                var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
+                await _cryptoService.SetMasterKeyAsync(masterKey);
+                await SetUserKeyAndContinueAsync(userKey);
+
+                // Re-enable biometrics
+                if (BiometricEnabled & !BiometricIntegrityValid)
+                {
+                    await _biometricService.SetupBiometricAsync();
                 }
-                else
+            }
+            else
+            {
+                var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
+                if (invalidUnlockAttempts >= 5)
                 {
-                    var invalidUnlockAttempts = await AppHelpers.IncrementInvalidUnlockAttemptsAsync();
-                    if (invalidUnlockAttempts >= 5)
-                    {
-                        _messagingService.Send("logout");
-                        return;
-                    }
-                    await _platformUtilsService.ShowDialogAsync(AppResources.InvalidMasterPassword,
-                        AppResources.AnErrorHasOccurred);
+                    _messagingService.Send("logout");
+                    return;
                 }
+                await _platformUtilsService.ShowDialogAsync(AppResources.InvalidMasterPassword,
+                    AppResources.AnErrorHasOccurred);
             }
         }
 
@@ -452,25 +496,36 @@ public void TogglePassword()
         {
             ShowPassword = !ShowPassword;
             var secret = PinEnabled ? Pin : MasterPassword;
-            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
+            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length,
+                nameof(FocusSecretEntry));
         }
 
         public async Task PromptBiometricAsync()
         {
-            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
-            BiometricButtonVisible = BiometricIntegrityValid;
-            if (!BiometricEnabled || !BiometricIntegrityValid)
+            try
             {
-                return;
+                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
+                BiometricButtonVisible = BiometricIntegrityValid;
+                if (!BiometricEnabled || !BiometricIntegrityValid)
+                {
+                    return;
+                }
+
+                var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
+                    PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
+                    () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)),
+                    !PinEnabled && !HasMasterPassword);
+
+                await _stateService.SetBiometricLockedAsync(!success);
+                if (success)
+                {
+                    var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
+                    await SetUserKeyAndContinueAsync(userKey);
+                }
             }
-            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
-                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
-            await _stateService.SetBiometricLockedAsync(!success);
-            if (success)
+            catch (LegacyUserException)
             {
-                var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
-                await SetUserKeyAndContinueAsync(userKey);
+                await HandleLegacyUserAsync();
             }
         }
 
@@ -493,5 +548,29 @@ private async Task DoContinueAsync()
             _messagingService.Send("unlocked");
             UnlockedAction?.Invoke();
         }
+
+        private async Task<bool> IsBiometricsEnabledAsync()
+        {
+            try
+            {
+                return await _vaultTimeoutService.IsBiometricLockSetAsync() &&
+                   await _biometricService.CanUseBiometricsUnlockAsync();
+            }
+            catch (LegacyUserException)
+            {
+                await HandleLegacyUserAsync();
+            }
+            return false;
+        }
+
+        private async Task HandleLegacyUserAsync()
+        {
+            // Legacy users must migrate on web vault.
+            await _platformUtilsService.ShowDialogAsync(AppResources.EncryptionKeyMigrationRequiredDescriptionLong,
+                AppResources.AnErrorHasOccurred,
+                AppResources.Ok);
+            await _vaultTimeoutService.LogOutAsync();
+        }
+
     }
 }
diff --git a/src/App/Pages/Accounts/LoginPageViewModel.cs b/src/App/Pages/Accounts/LoginPageViewModel.cs
index 387fec44f4b..f6e8592ea2f 100644
--- a/src/App/Pages/Accounts/LoginPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPageViewModel.cs
@@ -244,6 +244,14 @@ await _platformUtilsService.ShowDialogAsync(
 
                 await _deviceActionService.HideLoadingAsync();
 
+                if (response.RequiresEncryptionKeyMigration)
+                {
+                    // Legacy users must migrate on web vault.
+                    await _platformUtilsService.ShowDialogAsync(AppResources.EncryptionKeyMigrationRequiredDescriptionLong, AppResources.AnErrorHasOccurred,
+                        AppResources.Ok);
+                    return;
+                }
+
                 if (response.TwoFactor)
                 {
                     StartTwoFactorAction?.Invoke();
diff --git a/src/App/Pages/Settings/ExportVaultPage.xaml b/src/App/Pages/Settings/ExportVaultPage.xaml
index c1a54d4b545..0010e26ba61 100644
--- a/src/App/Pages/Settings/ExportVaultPage.xaml
+++ b/src/App/Pages/Settings/ExportVaultPage.xaml
@@ -38,7 +38,8 @@
                 <Label
                     Text="{u:I18n DisablePersonalVaultExportPolicyInEffect}"
                     StyleClass="text-muted, text-sm, text-bold"
-                    HorizontalTextAlignment="Center" />
+                    HorizontalTextAlignment="Center"
+                    AutomationId="DisablePrivateVaultPolicyLabel" />
             </Frame>
             <Grid
                 RowSpacing="10"
@@ -55,7 +56,8 @@
                         SelectedIndex="{Binding FileFormatSelectedIndex}"
                         SelectedIndexChanged="FileFormat_Changed"
                         StyleClass="box-value"
-                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}" />
+                        IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
+                        AutomationId="FileFormatPicker" />
                 </StackLayout>
                 <StackLayout
                     StyleClass="box-row"
@@ -72,7 +74,8 @@
                         HorizontalOptions="Fill"
                         VerticalOptions="End"
                         IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
-                        Margin="0,0,0,10"/>
+                        Margin="0,0,0,10"
+                        AutomationId="SendTOTPCodeButton" />
                 </StackLayout>
                 <Grid
                     StyleClass="box-row"
@@ -96,7 +99,8 @@
                         Grid.Row="1"
                         Grid.Column="0"
                         ReturnType="Go"
-                        ReturnCommand="{Binding ExportVaultCommand}" />
+                        ReturnCommand="{Binding ExportVaultCommand}"
+                        AutomationId="MasterPasswordEntry" />
                     <controls:IconButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -106,7 +110,8 @@
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
                         AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                        IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"/>
+                        IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"
+                        AutomationId="TogglePasswordVisibilityButton" />
                     <Label
                         Text="{u:I18n ConfirmYourIdentity}"
                         StyleClass="box-footer-label"
@@ -128,7 +133,8 @@
                     Clicked="ExportVault_Clicked"
                     HorizontalOptions="Fill"
                     VerticalOptions="End"
-                    IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"/>
+                    IsEnabled="{Binding DisablePrivateVaultPolicyEnabled, Converter={StaticResource inverseBool}}"
+                    AutomationId="ExportVaultButton" />
             </StackLayout>
         </StackLayout>
     </ScrollView>
diff --git a/src/App/Pages/Vault/BaseCipherViewModel.cs b/src/App/Pages/Vault/BaseCipherViewModel.cs
index 9cbfe7e8354..eed94236c82 100644
--- a/src/App/Pages/Vault/BaseCipherViewModel.cs
+++ b/src/App/Pages/Vault/BaseCipherViewModel.cs
@@ -37,7 +37,7 @@ public CipherView Cipher
             set => SetProperty(ref _cipher, value, additionalPropertyNames: AdditionalPropertiesToRaiseOnCipherChanged);
         }
 
-        public string CreationDate => string.Format(AppResources.CreatedX, Cipher.CreationDate.ToShortDateString());
+        public string CreationDate => string.Format(AppResources.CreatedXY, Cipher.CreationDate.ToShortDateString(), Cipher.CreationDate.ToShortTimeString());
 
         public AsyncCommand CheckPasswordCommand { get; }
 
diff --git a/src/App/Pages/Vault/CipherAddEditPage.xaml b/src/App/Pages/Vault/CipherAddEditPage.xaml
index 453da914649..ec28d128a81 100644
--- a/src/App/Pages/Vault/CipherAddEditPage.xaml
+++ b/src/App/Pages/Vault/CipherAddEditPage.xaml
@@ -229,9 +229,9 @@
                         Margin="0,10,0,0"
                         IsVisible="{Binding ShowPasskeyInfo}"/>
                     <Entry
-                        Text="{u:I18n AvailableForTwoStepLogin}"
+                        Text="{Binding CreationDate}"
                         IsEnabled="False"
-                        StyleClass="box-value,text-muted"
+                        StyleClass="box-value,text-muted" 
                         IsVisible="{Binding ShowPasskeyInfo}" />
 
                     <Grid StyleClass="box-row, box-row-input">
@@ -650,38 +650,6 @@
                             AutomationId="IdentityCountryEntry" />
                     </StackLayout>
                 </StackLayout>
-
-                <StackLayout IsVisible="{Binding IsFido2Key}" Spacing="0" Padding="0">
-                    <Label
-                        Text="{u:I18n Username}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        x:Name="_fido2KeyUsernameEntry"
-                        Text="{Binding Cipher.Fido2Key.UserName}"
-                        StyleClass="box-value" 
-                        Grid.Row="1"/>
-                    <Label
-                        Text="{u:I18n Passkey}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        Text="{Binding CreationDate}"
-                        IsEnabled="False"
-                        StyleClass="box-value,text-muted" />
-                    <Label
-                        Text="{u:I18n Application}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        Text="{Binding Cipher.Fido2Key.LaunchUri}"
-                        IsEnabled="False"
-                        StyleClass="box-value,text-muted" />
-                    <Label
-                        Text="{u:I18n YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey}"
-                        StyleClass="box-sub-label" />
-                </StackLayout>
-
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding IsLogin}">
                 <StackLayout StyleClass="box-row-header">
diff --git a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
index eb7519ecc3a..f5bfd0c6459 100644
--- a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
@@ -296,7 +296,6 @@ public bool HasCollections
         public bool IsIdentity => Cipher?.Type == CipherType.Identity;
         public bool IsCard => Cipher?.Type == CipherType.Card;
         public bool IsSecureNote => Cipher?.Type == CipherType.SecureNote;
-        public bool IsFido2Key => Cipher?.Type == CipherType.Fido2Key;
         public bool ShowUris => IsLogin && Cipher.Login.HasUris;
         public bool ShowAttachments => Cipher.HasAttachments;
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
@@ -309,7 +308,7 @@ public bool HasCollections
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public bool HasTotpValue => IsLogin && !string.IsNullOrEmpty(Cipher?.Login?.Totp);
         public string SetupTotpText => $"{BitwardenIcons.Camera} {AppResources.SetupTotp}";
-        public bool ShowPasskeyInfo => Cipher?.Login?.Fido2Key != null && !CloneMode;
+        public bool ShowPasskeyInfo => Cipher?.HasFido2Key == true && !CloneMode;
 
         public void Init()
         {
@@ -371,7 +370,7 @@ public async Task<bool> LoadAsync(AppOptions appOptions = null)
                         if (Cipher.Type == CipherType.Login)
                         {
                             // passkeys can't be cloned
-                            Cipher.Login.Fido2Key = null;
+                            Cipher.Login.Fido2Keys = null;
                         }
                     }
                     if (appOptions?.OtpData != null && Cipher.Type == CipherType.Login)
diff --git a/src/App/Pages/Vault/CipherDetailsPage.xaml b/src/App/Pages/Vault/CipherDetailsPage.xaml
index 8aaf74706af..9c97500a105 100644
--- a/src/App/Pages/Vault/CipherDetailsPage.xaml
+++ b/src/App/Pages/Vault/CipherDetailsPage.xaml
@@ -199,12 +199,12 @@
                                 Text="{u:I18n Passkey}"
                                 StyleClass="box-label"
                                 Margin="0,10,0,0"
-                                IsVisible="{Binding Cipher.Login.Fido2Key, Converter={StaticResource notNull}}"/>
+                                IsVisible="{Binding Cipher.Login.MainFido2Key, Converter={StaticResource notNull}}"/>
                             <Entry
-                                Text="{u:I18n AvailableForTwoStepLogin}"
+                                Text="{Binding CreationDate}"
                                 IsEnabled="False"
                                 StyleClass="box-value,text-muted"
-                                IsVisible="{Binding Cipher.Login.Fido2Key, Converter={StaticResource notNull}}" />
+                                IsVisible="{Binding Cipher.Login.MainFido2Key, Converter={StaticResource notNull}}" />
                             <Grid StyleClass="box-row"
                                   IsVisible="{Binding ShowTotp}"
                                   AutomationId="ItemRow">
@@ -579,64 +579,6 @@
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator" IsVisible="{Binding ShowIdentityAddress}" />
                         </StackLayout>
-                        <StackLayout
-                            IsVisible="{Binding IsFido2Key}"
-                            Spacing="0"
-                            Padding="0"
-                            Margin="0,10,0,0">
-                            <Label
-                                Text="{u:I18n Username}"
-                                StyleClass="box-label" />
-                            <Label
-                                Text="{Binding Cipher.Fido2Key.UserName, Mode=OneWay}"
-                                StyleClass="box-value" />
-                            <BoxView StyleClass="box-row-separator" Margin="0,10,0,0" />
-                            <Label
-                                Text="{u:I18n Passkey}"
-                                StyleClass="box-label"
-                                Margin="0,10,0,0" />
-                            <Label
-                                Text="{Binding CreationDate, Mode=OneWay}"
-                                StyleClass="box-value" />
-                            <BoxView StyleClass="box-row-separator" Margin="0,10,0,0" />
-                            <Grid
-                                StyleClass="box-row"
-                                RowDefinitions="Auto,*,Auto"
-                                ColumnDefinitions="*,Auto,Auto">
-                                <Label
-                                    Text="{u:I18n Application}"
-                                    StyleClass="box-label" />
-                                <Label
-                                    Grid.Row="1"
-                                    Text="{Binding Cipher.Fido2Key.LaunchUri, Mode=OneWay}"
-                                    StyleClass="box-value" />
-                                <controls:IconButton
-                                    StyleClass="box-row-button, box-row-button-platform"
-                                    Text="{Binding Source={x:Static core:BitwardenIcons.ShareSquare}}"
-                                    Command="{Binding LaunchUriCommand}"
-                                    CommandParameter="{Binding Cipher.Fido2Key}"
-                                    Grid.Column="1"
-                                    Grid.RowSpan="2"
-                                    VerticalOptions="End"
-                                    IsVisible="{Binding Cipher.Fido2Key.CanLaunch, Mode=OneWay}"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n Launch}" />
-                                <controls:IconButton
-                                    StyleClass="box-row-button, box-row-button-platform"
-                                    Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-                                    Command="{Binding CopyCommand}"
-                                    CommandParameter="Fido2KeyApplication"
-                                    Grid.Column="2"
-                                    Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyApplication}" />
-                                <BoxView
-                                    StyleClass="box-row-separator"
-                                    Margin="0,3,0,0"
-                                    Grid.Row="2"
-                                    Grid.ColumnSpan="3" />
-                            </Grid>
-                        </StackLayout>
                     </StackLayout>
                     <StackLayout StyleClass="box" IsVisible="{Binding ShowUris}">
                         <StackLayout StyleClass="box-row-header">
diff --git a/src/App/Pages/Vault/CipherDetailsPageViewModel.cs b/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
index 5bfb30129b9..f12348c103d 100644
--- a/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
@@ -148,7 +148,6 @@ public bool ShowCardCode
         public bool IsIdentity => Cipher?.Type == Core.Enums.CipherType.Identity;
         public bool IsCard => Cipher?.Type == Core.Enums.CipherType.Card;
         public bool IsSecureNote => Cipher?.Type == Core.Enums.CipherType.SecureNote;
-        public bool IsFido2Key => Cipher?.Type == Core.Enums.CipherType.Fido2Key;
         public FormattedString ColoredPassword => GeneratedValueFormatter.Format(Cipher.Login.Password);
         public FormattedString UpdatedText
         {
@@ -649,11 +648,6 @@ private async Task CopyAsync(string id, string text = null)
                 text = Cipher.Card.Code;
                 name = AppResources.SecurityCode;
             }
-            else if (id == "Fido2KeyApplication")
-            {
-                text = Cipher.Fido2Key?.LaunchUri;
-                name = AppResources.Application;
-            }
 
             if (text != null)
             {
@@ -708,18 +702,12 @@ public async Task<bool> PromptPasswordAsync()
 
         private async Task<bool> CanCloneAsync()
         {
-            if (Cipher.Type == CipherType.Fido2Key)
-            {
-                await _platformUtilsService.ShowDialogAsync(AppResources.PasskeyWillNotBeCopied);
-                return false;
-            }
-
-            if (Cipher.Type == CipherType.Login && Cipher.Login?.Fido2Key != null)
+            if (!Cipher.HasFido2Key)
             {
-                return await _platformUtilsService.ShowDialogAsync(AppResources.ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem, AppResources.PasskeyWillNotBeCopied, AppResources.Yes, AppResources.No);
+                return true;
             }
 
-            return true;
+            return await _platformUtilsService.ShowDialogAsync(AppResources.ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem, AppResources.PasskeyWillNotBeCopied, AppResources.Yes, AppResources.No);
         }
     }
 }
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
index a87287e05f5..d4583d71cbb 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
@@ -60,9 +60,6 @@ public string Name
                         case CipherType.Identity:
                             _name = AppResources.TypeIdentity;
                             break;
-                        case CipherType.Fido2Key:
-                            _name = AppResources.Passkey;
-                            break;
                         default:
                             break;
                     }
@@ -111,9 +108,6 @@ public string Icon
                         case CipherType.Identity:
                             _icon = BitwardenIcons.IdCard;
                             break;
-                        case CipherType.Fido2Key:
-                            _icon = BitwardenIcons.Passkey;
-                            break;
                         default:
                             _icon = BitwardenIcons.Globe;
                             break;
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
index da10a11a3de..4a57430a96a 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -569,7 +569,7 @@ private async Task LoadDataAsync()
                 {
                     Filter = c => !c.IsDeleted
                                   &&
-                                  Type.Value.IsEqualToOrCanSignIn(c.Type);
+                                  Type.Value == c.Type;
                 }
                 else if (FolderId != null)
                 {
@@ -636,9 +636,7 @@ private async Task LoadDataAsync()
                         NoFolderCiphers.Add(c);
                     }
 
-                    // Fido2Key ciphers should be counted as Login ciphers
-                    var countType = c.Type == CipherType.Fido2Key ? CipherType.Login : c.Type;
-                    _typeCounts[countType] = _typeCounts.TryGetValue(countType, out var currentTypeCount)
+                    _typeCounts[c.Type] = _typeCounts.TryGetValue(c.Type, out var currentTypeCount)
                                                 ? currentTypeCount + 1
                                                 : 1;
                 }
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index df730d51b24..104e2049a58 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -259,6 +259,15 @@ public static string AccountLoggedOut {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Account logged out..
+        /// </summary>
+        public static string AccountLoggedOutBiometricExceeded {
+            get {
+                return ResourceManager.GetString("AccountLoggedOutBiometricExceeded", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Account logged out successfully.
         /// </summary>
@@ -421,6 +430,15 @@ public static string AddTotp {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to addy.io.
+        /// </summary>
+        public static string AddyIo {
+            get {
+                return ResourceManager.GetString("AddyIo", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Admin approval requested.
         /// </summary>
@@ -511,15 +529,6 @@ public static string AnErrorOccurredWhileSendingAVerificationCodeToYourEmailPlea
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to addy.io.
-        /// </summary>
-        public static string AddyIo {
-            get {
-                return ResourceManager.GetString("AddyIo", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to A notification has been sent to your device..
         /// </summary>
@@ -1798,6 +1807,15 @@ public static string CreatedX {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Created {0}, {1}.
+        /// </summary>
+        public static string CreatedXY {
+            get {
+                return ResourceManager.GetString("CreatedXY", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Creating account....
         /// </summary>
@@ -2410,6 +2428,15 @@ public static string EncExportKeyWarning {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Encryption key migration required. Please login through the web vault to update your encryption key..
+        /// </summary>
+        public static string EncryptionKeyMigrationRequiredDescriptionLong {
+            get {
+                return ResourceManager.GetString("EncryptionKeyMigrationRequiredDescriptionLong", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enter your account email address to receive your master password hint..
         /// </summary>
@@ -6564,6 +6591,15 @@ public static string Tools {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Too many attempts.
+        /// </summary>
+        public static string TooManyAttempts {
+            get {
+                return ResourceManager.GetString("TooManyAttempts", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to TOTP.
         /// </summary>
@@ -6817,7 +6853,7 @@ public static string Unlock {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve..
+        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve..
         /// </summary>
         public static string UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve {
             get {
diff --git a/src/App/Resources/AppResources.af.resx b/src/App/Resources/AppResources.af.resx
index 63fc919586f..dc3e356f86a 100644
--- a/src/App/Resources/AppResources.af.resx
+++ b/src/App/Resources/AppResources.af.resx
@@ -954,6 +954,9 @@ Skandering gebeur outomaties.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>U kan nie hierdie funksie gebruik tot u u enkripsiesleutel bygewerk het nie.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Leer meer</value>
   </data>
@@ -2761,4 +2764,10 @@ Wil u na die rekening omskakel?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ar.resx b/src/App/Resources/AppResources.ar.resx
index 68b0ef4104f..d01262770da 100644
--- a/src/App/Resources/AppResources.ar.resx
+++ b/src/App/Resources/AppResources.ar.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>لا يمكنك استخدام هذه الميزة حتى تقوم بتحديث مفتاح التشفير الخاص بك.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>مطلوب ترحيل مفتاح التشفير. الرجاء تسجيل الدخول بواسطة مخزن الويب لتحديث مفتاح التشفير الخاص بك.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>اعرف المزيد</value>
   </data>
@@ -2762,4 +2765,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>جارٍ تسجيل الدخول</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>لقد أجريت محاولات كثيرة</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>تم تسجيل الخروج من الحساب.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.az.resx b/src/App/Resources/AppResources.az.resx
index d91aa924c5b..aa0b71500c2 100644
--- a/src/App/Resources/AppResources.az.resx
+++ b/src/App/Resources/AppResources.az.resx
@@ -954,6 +954,9 @@ Skan prosesi avtomatik baş tutacaq.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Şifrələmə açarınızı güncəlləyənə qədər bu özəlliyi istifadə edə bilməzsiniz.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Şifrələmə açarının daşınması tələb olunur. Şifrələmə açarınızı güncəlləmək üçün zəhmət olmasa veb anbar üzərindən giriş edin.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Daha ətraflı</value>
   </data>
@@ -2645,38 +2648,38 @@ Bu hesaba keçmək istəyirsiniz?</value>
     <value>Bu cihazı xatırla</value>
   </data>
   <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
+    <value>Keçid açarı</value>
   </data>
   <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
+    <value>Keçid açarı</value>
   </data>
   <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
+    <value>{0} yaradıldı</value>
     <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
   </data>
   <data name="Application" xml:space="preserve">
-    <value>Application</value>
+    <value>Tətbiq</value>
   </data>
   <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
+    <value>Keçid açarı tətbiqinə düzəliş edə bilməzsiniz, çünki bu, keçid açarını yararsız edəcək</value>
   </data>
   <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
+    <value>Keçid açarı kopyalanmır</value>
   </data>
   <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
+    <value>Keçid açarı, klonlanmış elementə kopyalanmayacaq. Bu elementi klonlamağa davam etmək istəyirsiniz?</value>
   </data>
   <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
+    <value>Tətbiqi kopyala</value>
   </data>
   <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
+    <value>İki addımlı giriş üçün əlçatandır</value>
   </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Ana parolu təkrar soruş köməyi</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
+    <value>Yetərsiz yaddaşa görə kilid açma uğursuz ola bilər. Həll etmək üçün KDF yaddaş tənzimləmələrinizi azaldın və ya biometrik kilid açmanı quraşdırın.</value>
   </data>
   <data name="InvalidAPIKey" xml:space="preserve">
     <value>Yararsız API açarı</value>
@@ -2703,7 +2706,7 @@ Bu hesaba keçmək istəyirsiniz?</value>
     <value>Anbar vaxt bitməsi əməliyyatı "çıxış et" olaraq dəyişdirildi</value>
   </data>
   <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
+    <value>Bu element təşkilatla paylaşıla bilmir, çünki eyni keçid açarına sahib bir element artıq mövcuddur.</value>
   </data>
   <data name="BlockAutoFill" xml:space="preserve">
     <value>Avto-doldurmanı əngəllə</value>
@@ -2760,4 +2763,10 @@ Bu hesaba keçmək istəyirsiniz?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Giriş edilir</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Həddən artıq cəhd</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Hesabdan çıxış edildi.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.be.resx b/src/App/Resources/AppResources.be.resx
index 1574e687aff..2f921e86801 100644
--- a/src/App/Resources/AppResources.be.resx
+++ b/src/App/Resources/AppResources.be.resx
@@ -953,6 +953,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Вы не зможаце выкарыстоўваць гэту функцыю, пакуль не абнавіце свой ключ шыфравання.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Даведацца больш</value>
   </data>
@@ -2761,4 +2764,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.bg.resx b/src/App/Resources/AppResources.bg.resx
index 1974e49a168..2e0cf40e59f 100644
--- a/src/App/Resources/AppResources.bg.resx
+++ b/src/App/Resources/AppResources.bg.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Трябва да обновите шифриращия си ключ, за да използвате тази възможност.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Необходима е промяна на шифриращия ключ. Впишете се в трезора си по уеб, за да обновите своя шифриращ ключ.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Научете повече</value>
   </data>
@@ -2761,4 +2764,10 @@ select Add TOTP to store the key safely</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Вписване в</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Твърде много опити</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Акаунтът е отписан.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.bn.resx b/src/App/Resources/AppResources.bn.resx
index 75e2537a2c5..9a245d58876 100644
--- a/src/App/Resources/AppResources.bn.resx
+++ b/src/App/Resources/AppResources.bn.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>আপনি আপনার এনক্রিপশন কী হালনাগাদ না করা পর্যন্ত এই বৈশিষ্ট্যটি ব্যবহার করতে পারবেন না।</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>আরও জানুন</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.bs.resx b/src/App/Resources/AppResources.bs.resx
index 6fc2d37a8ae..5d6df71661b 100644
--- a/src/App/Resources/AppResources.bs.resx
+++ b/src/App/Resources/AppResources.bs.resx
@@ -954,6 +954,9 @@ Skeniranje će biti izvršeno automatski.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Ovu funkciju ne možete koristiti dok ne ažurirate ključ za šifrovanje.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Saznajte više</value>
   </data>
@@ -2760,4 +2763,10 @@ Skeniranje će biti izvršeno automatski.</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ca.resx b/src/App/Resources/AppResources.ca.resx
index 9cfc8085c47..be97174e677 100644
--- a/src/App/Resources/AppResources.ca.resx
+++ b/src/App/Resources/AppResources.ca.resx
@@ -954,6 +954,9 @@ L'escaneig es farà automàticament.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>No podeu utilitzar aquesta característica fins que no actualitzeu la vostra clau de xifratge.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Més informació</value>
   </data>
@@ -2761,4 +2764,10 @@ Voleu canviar a aquest compte?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Inici de sessió en</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.cs.resx b/src/App/Resources/AppResources.cs.resx
index ffe565b48dc..61016304ecc 100644
--- a/src/App/Resources/AppResources.cs.resx
+++ b/src/App/Resources/AppResources.cs.resx
@@ -954,6 +954,9 @@ Načtení proběhne automaticky.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Dokud neaktualizujete svůj šifrovací klíč, nemůžete tuto funkci použít.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Vyžaduje se migrace šifrovacího klíče. Pro aktualizaci šifrovacího klíče se přihlaste přes webový trezor.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Dozvědět se více</value>
   </data>
@@ -2760,4 +2763,10 @@ Chcete se přepnout na tento účet?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Přihlašování na</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Příliš mnoho pokusů</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Účet byl odhlášen.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.cy.resx b/src/App/Resources/AppResources.cy.resx
index 03fcb5320f2..2dc48859e00 100644
--- a/src/App/Resources/AppResources.cy.resx
+++ b/src/App/Resources/AppResources.cy.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Dysgu mwy</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.da.resx b/src/App/Resources/AppResources.da.resx
index 56ab6ca01bd..04e6ee37689 100644
--- a/src/App/Resources/AppResources.da.resx
+++ b/src/App/Resources/AppResources.da.resx
@@ -954,6 +954,9 @@ Skanning vil ske automatisk.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Du kan ikke bruge denne funktion, før du opdaterer din krypteringsnøgle.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Krypteringsnøglemigrering nødvendig. Log ind gennem web-boksen for at opdatere krypteringsnøglen.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Få mere at vide</value>
   </data>
@@ -2761,4 +2764,10 @@ Vil du skifte til denne konto?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logger ind på</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>For mange forsøg</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Konto logget ud.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.de.resx b/src/App/Resources/AppResources.de.resx
index 11c44b34c76..580ff8afe21 100644
--- a/src/App/Resources/AppResources.de.resx
+++ b/src/App/Resources/AppResources.de.resx
@@ -954,6 +954,9 @@ Das Scannen erfolgt automatisch.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Du kannst diese Funktion nicht nutzen, solange du deinen Verschlüsselungsschlüssel nicht aktualisiert hast.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Mehr erfahren</value>
   </data>
@@ -2676,7 +2679,7 @@ Möchtest du zu diesem Konto wechseln?</value>
     <value>Hilfe zum erneuten Abfragen des Master-Passworts</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
+    <value>Das Entsperren kann aufgrund unzureichenden Arbeitsspeichers fehlschlagen. Verringere deine KDF-Speichereinstellungen oder richte die biometrische Entsperrung, um dies zu lösen.</value>
   </data>
   <data name="InvalidAPIKey" xml:space="preserve">
     <value>Ungültiger API-Schlüssel</value>
@@ -2700,7 +2703,7 @@ Möchtest du zu diesem Konto wechseln?</value>
     <value>Anmelden als {0}</value>
   </data>
   <data name="VaultTimeoutActionChangedToLogOut" xml:space="preserve">
-    <value>Vault timeout action changed to log out</value>
+    <value>Tresor-Timeoutaktion auf "Abmelden" geändert</value>
   </data>
   <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
     <value>Dieser Eintrag kann nicht mit der Organisation geteilt werden, da bereits einer mit dem gleichen Passkey existiert.</value>
@@ -2760,4 +2763,10 @@ Möchtest du zu diesem Konto wechseln?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Anmelden bei</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Zu viele Versuche</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Konto abgemeldet.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.el.resx b/src/App/Resources/AppResources.el.resx
index 7b847a0a063..bc6c5397ef5 100644
--- a/src/App/Resources/AppResources.el.resx
+++ b/src/App/Resources/AppResources.el.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Δεν μπορείτε να χρησιμοποιήσετε αυτήν τη δυνατότητα μέχρι να ενημερώσετε το κλειδί κρυπτογράφησης.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Μάθετε Περισσότερα</value>
   </data>
@@ -2761,4 +2764,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.en-GB.resx b/src/App/Resources/AppResources.en-GB.resx
index 51935e5c6c2..69d9f6b4ac5 100644
--- a/src/App/Resources/AppResources.en-GB.resx
+++ b/src/App/Resources/AppResources.en-GB.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2761,4 +2764,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.en-IN.resx b/src/App/Resources/AppResources.en-IN.resx
index 9ede8f4be6f..55f39aaa1ac 100644
--- a/src/App/Resources/AppResources.en-IN.resx
+++ b/src/App/Resources/AppResources.en-IN.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2775,4 +2778,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.es.resx b/src/App/Resources/AppResources.es.resx
index a2d0bb5b401..a65da95163b 100644
--- a/src/App/Resources/AppResources.es.resx
+++ b/src/App/Resources/AppResources.es.resx
@@ -954,6 +954,9 @@ El escaneo se realizará automáticamente.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>No puedes usar esta característica hasta que actualices tu clave de cifrado.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Aprender más</value>
   </data>
@@ -2762,4 +2765,10 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.et.resx b/src/App/Resources/AppResources.et.resx
index 473c7ce2273..e03488370f5 100644
--- a/src/App/Resources/AppResources.et.resx
+++ b/src/App/Resources/AppResources.et.resx
@@ -954,6 +954,9 @@ Skaneerimine toimub automaatselt.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Seda funktsiooni ei saa enne krüpteerimise võtme uuendamist kasutada.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Rohkem teavet</value>
   </data>
@@ -2761,4 +2764,10 @@ Soovid selle konto peale lülituda?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Sisselogimas kui</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.eu.resx b/src/App/Resources/AppResources.eu.resx
index 8aebe08727a..6472a750fda 100644
--- a/src/App/Resources/AppResources.eu.resx
+++ b/src/App/Resources/AppResources.eu.resx
@@ -953,6 +953,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Ezin duzu ezaugarri hau erabili zifratze-gakoa eguneratu arte.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Gehiago ezagutu</value>
   </data>
@@ -2760,4 +2763,10 @@ Kontu honetara aldatu nahi duzu?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.fa.resx b/src/App/Resources/AppResources.fa.resx
index 93c4d425c43..27ae9d65156 100644
--- a/src/App/Resources/AppResources.fa.resx
+++ b/src/App/Resources/AppResources.fa.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>تا زمانی که کد رمزنگاری را به‌روز نکنید نمی‌توانید از این قابلیت استفاده کنید.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>بیشتر بدانید</value>
   </data>
@@ -2762,4 +2765,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>ورود با</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.fi.resx b/src/App/Resources/AppResources.fi.resx
index 1880f3db41f..3329cb2c842 100644
--- a/src/App/Resources/AppResources.fi.resx
+++ b/src/App/Resources/AppResources.fi.resx
@@ -954,6 +954,9 @@ Koodi luetaan automaattisesti.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Et voi käyttää tätä toimintoa ennen kuin päivität salausavaimesi.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Salausavaimen siirto vaaditaan. Päivitä salausavaimesi kirjautumalla verkkoholviin.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Lue lisää</value>
   </data>
@@ -2762,4 +2765,10 @@ Haluatko vaihtaa tähän tiliin?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Kirjaudutaan sijaintiin</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Liian monta yritystä</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Tili kirjattiin ulos.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.fil.resx b/src/App/Resources/AppResources.fil.resx
index 3a1de4f95c9..c47c65f3e64 100644
--- a/src/App/Resources/AppResources.fil.resx
+++ b/src/App/Resources/AppResources.fil.resx
@@ -954,6 +954,9 @@ Awtomatikong itong magsa-scan.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Hindi mo magagamit ang feature na ito hanggang sa i-update mo ang encryption key mo.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Matuto pa</value>
   </data>
@@ -2762,4 +2765,10 @@ Gusto mo bang pumunta sa account na ito?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.fr.resx b/src/App/Resources/AppResources.fr.resx
index 709501a1118..7baddc274ff 100644
--- a/src/App/Resources/AppResources.fr.resx
+++ b/src/App/Resources/AppResources.fr.resx
@@ -954,6 +954,9 @@ La numérisation se fera automatiquement.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Vous ne pouvez pas utiliser cette fonctionnalité tant que vous ne mettez pas à jour votre clé de chiffrement.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Migration de la clé de chiffrement nécessaire. Veuillez vous connecter sur le coffre web pour mettre à jour votre clé de chiffrement.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>En savoir plus</value>
   </data>
@@ -2629,22 +2632,22 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Mot de passe principal actuel</value>
   </data>
   <data name="LoggedIn" xml:space="preserve">
-    <value>Logged in!</value>
+    <value>Connecté !</value>
   </data>
   <data name="ApproveWithMyOtherDevice" xml:space="preserve">
     <value>Approve with my other device</value>
   </data>
   <data name="RequestAdminApproval" xml:space="preserve">
-    <value>Request admin approval</value>
+    <value>Demander l'approbation de l'administrateur</value>
   </data>
   <data name="ApproveWithMasterPassword" xml:space="preserve">
-    <value>Approve with master password</value>
+    <value>Approuver avec le mot de passe principal</value>
   </data>
   <data name="TurnOffUsingPublicDevice" xml:space="preserve">
     <value>Turn off using a public device</value>
   </data>
   <data name="RememberThisDevice" xml:space="preserve">
-    <value>Remember this device</value>
+    <value>Se souvenir de cet appareil</value>
   </data>
   <data name="Passkey" xml:space="preserve">
     <value>Clé d'accès</value>
@@ -2678,7 +2681,7 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Aide sur la ressaisie du mot de passe principal</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
+    <value>Le déverrouillage peut échouer en raison d'une mémoire insuffisante. Diminuez les paramètres de mémoire KDF ou configurer le déverrouillage biométique pour y remédier.</value>
   </data>
   <data name="InvalidAPIKey" xml:space="preserve">
     <value>Clé API invalide</value>
@@ -2687,16 +2690,16 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Jeton API invalide</value>
   </data>
   <data name="AdminApprovalRequested" xml:space="preserve">
-    <value>Admin approval requested</value>
+    <value>Approbation de l'administrateur demandée</value>
   </data>
   <data name="YourRequestHasBeenSentToYourAdmin" xml:space="preserve">
-    <value>Your request has been sent to your admin.</value>
+    <value>Votre demande a été envoyée à votre administrateur.</value>
   </data>
   <data name="YouWillBeNotifiedOnceApproved" xml:space="preserve">
-    <value>You will be notified once approved. </value>
+    <value>Vous serez notifié une fois approuvé. </value>
   </data>
   <data name="TroubleLoggingIn" xml:space="preserve">
-    <value>Trouble logging in?</value>
+    <value>Problème pour vous connecter ?</value>
   </data>
   <data name="LoggingInAsX" xml:space="preserve">
     <value>Logging in as {0}</value>
@@ -2757,9 +2760,15 @@ Voulez-vous basculer vers ce compte ?</value>
     <value>Log in with device must be set up in the settings of the Bitwarden app. Need another option?</value>
   </data>
   <data name="LogInWithDevice" xml:space="preserve">
-    <value>Log in with device</value>
+    <value>Se connecter avec l'appareil</value>
   </data>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Connexion sur</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Trop de tentatives</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Compte déconnecté.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.gl.resx b/src/App/Resources/AppResources.gl.resx
index 6cfe82ce695..aa8c6ff88c5 100644
--- a/src/App/Resources/AppResources.gl.resx
+++ b/src/App/Resources/AppResources.gl.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.he.resx b/src/App/Resources/AppResources.he.resx
index 19d61795d35..6fd9fc0abf7 100644
--- a/src/App/Resources/AppResources.he.resx
+++ b/src/App/Resources/AppResources.he.resx
@@ -955,6 +955,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>לא ניתן להשתמש ביכולת זו עד שתעדכן את מפתח ההצפנה שלך.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>למידע נוסף</value>
   </data>
@@ -2764,4 +2767,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.hi.resx b/src/App/Resources/AppResources.hi.resx
index b50f31de2e3..b0705cb6f06 100644
--- a/src/App/Resources/AppResources.hi.resx
+++ b/src/App/Resources/AppResources.hi.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>अधिक जानें</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.hr.resx b/src/App/Resources/AppResources.hr.resx
index 02fb149d64a..8b7e2efb7db 100644
--- a/src/App/Resources/AppResources.hr.resx
+++ b/src/App/Resources/AppResources.hr.resx
@@ -953,6 +953,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Ne možeš koristiti ovu značajku dok ne ažuriraš svoj ključ za šifriranje.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Saznaj više</value>
   </data>
@@ -2759,4 +2762,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>Prijava na</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.hu.resx b/src/App/Resources/AppResources.hu.resx
index 78c9eba07c0..6c6ea489fec 100644
--- a/src/App/Resources/AppResources.hu.resx
+++ b/src/App/Resources/AppResources.hu.resx
@@ -953,6 +953,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Ez a funkció nem használható, amíg nem frissíted a titkosítási kulcsodat.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Titkosítási kulcs migráció szükséges. Jelentkezzünk be a webes széfen keresztül a titkosítási kulcs frissítéséhez.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>További információ</value>
   </data>
@@ -2760,4 +2763,10 @@ Szeretnénk átváltani erre a fiókra?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Bejelentkezés:</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Túl sok próbálkozás történt</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>A fiók kijelentkezett.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.id.resx b/src/App/Resources/AppResources.id.resx
index 7711d18b251..3e531b0af3d 100644
--- a/src/App/Resources/AppResources.id.resx
+++ b/src/App/Resources/AppResources.id.resx
@@ -954,6 +954,9 @@ Proses pindai akan terjadi secara otomatis.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Anda tidak dapat menggunakan fitur ini sampai Anda memperbarui kunci enkripsi Anda.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Pelajari Lebih Lanjut</value>
   </data>
@@ -2761,4 +2764,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.it.resx b/src/App/Resources/AppResources.it.resx
index 34f293b39f1..9b06a90d489 100644
--- a/src/App/Resources/AppResources.it.resx
+++ b/src/App/Resources/AppResources.it.resx
@@ -953,6 +953,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Non puoi utilizzare questa funzione finché non aggiorni la tua chiave di criptografia.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Migrazione della chiave di criptografia obbligatoria. Accedi tramite la cassaforte web per aggiornare la tua chiave di criptografia.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Ulteriori informazioni</value>
   </data>
@@ -2761,4 +2764,10 @@ Vuoi passare a questo account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Accedendo su</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Troppi tentativi</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account uscito.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ja.resx b/src/App/Resources/AppResources.ja.resx
index b1dc3380dd3..63bfda8617d 100644
--- a/src/App/Resources/AppResources.ja.resx
+++ b/src/App/Resources/AppResources.ja.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>暗号キーを更新するまでこの機能は使用できません。</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>暗号化キーの移行が必要です。暗号化キーを更新するには、ウェブ保管庫からログインしてください。</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>詳細情報</value>
   </data>
@@ -2677,7 +2680,7 @@
     <value>マスターパスワードの再プロンプトヘルプ</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings or set up biometric unlock to resolve.</value>
+    <value>メモリ不足により、ロック解除に失敗する可能性があります。解決するには、KDF のメモリ設定を減らすか、生体認証によるロック解除を設定してください。</value>
   </data>
   <data name="InvalidAPIKey" xml:space="preserve">
     <value>無効な API キー</value>
@@ -2761,4 +2764,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>ログイン先</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>試行回数が多すぎます</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>アカウントからログアウトしました。</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ka.resx b/src/App/Resources/AppResources.ka.resx
index 6cfe82ce695..aa8c6ff88c5 100644
--- a/src/App/Resources/AppResources.ka.resx
+++ b/src/App/Resources/AppResources.ka.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.kn.resx b/src/App/Resources/AppResources.kn.resx
index 455237008eb..c4c56231944 100644
--- a/src/App/Resources/AppResources.kn.resx
+++ b/src/App/Resources/AppResources.kn.resx
@@ -955,6 +955,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>ನಿಮ್ಮ ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಕೀಲಿಯನ್ನು ನವೀಕರಿಸುವವರೆಗೆ ನೀವು ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲಾಗುವುದಿಲ್ಲ.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ko.resx b/src/App/Resources/AppResources.ko.resx
index fb0671dca2b..b2aae3906c2 100644
--- a/src/App/Resources/AppResources.ko.resx
+++ b/src/App/Resources/AppResources.ko.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>이 기능을 사용하려면 암호화 키를 업데이트해야 합니다.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>더 알아보기</value>
   </data>
@@ -2761,4 +2764,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.lt.resx b/src/App/Resources/AppResources.lt.resx
index 7f86779b167..0b6c66f5858 100644
--- a/src/App/Resources/AppResources.lt.resx
+++ b/src/App/Resources/AppResources.lt.resx
@@ -954,6 +954,9 @@ Nuskaitymas vyks automatiškai.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Negalite naudoti šios funkcijos, kol neatnaujinsite šifravimo raktą.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Sužinoti daugiau</value>
   </data>
@@ -2762,4 +2765,10 @@ Ar norite pereiti prie šios paskyros?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.lv.resx b/src/App/Resources/AppResources.lv.resx
index d1d59368303..02319e752eb 100644
--- a/src/App/Resources/AppResources.lv.resx
+++ b/src/App/Resources/AppResources.lv.resx
@@ -954,6 +954,9 @@ Nolasīšana notiks automātiski.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Šo iespēju nevar izmantot, kamēr nav atjaunināta šifrēšanas atslēga.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Nepieciešama šifrēšanas atslēgas nomaiņa. Lūgums pieteikties tīmekļa glabātavā, lai atjauninātu savu šifrēšanas atslēgu.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Uzzināt vairāk</value>
   </data>
@@ -2762,4 +2765,10 @@ Vai pārslēgties uz šo kontu?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Piesakās</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Pārāk daudz mēģinājumu</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Konts tika izrakstīts.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ml.resx b/src/App/Resources/AppResources.ml.resx
index fbf3bd3903f..eceed962518 100644
--- a/src/App/Resources/AppResources.ml.resx
+++ b/src/App/Resources/AppResources.ml.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>നിങ്ങളുടെ എൻ‌ക്രിപ്ഷൻ കീ അപ്‌ഡേറ്റ് ചെയ്യുന്നതുവരെ നിങ്ങൾക്ക് ഈ സവിശേഷത ഉപയോഗിക്കാൻ കഴിയില്ല.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>കൂടുതൽ അറിയാൻ</value>
   </data>
@@ -2761,4 +2764,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.mr.resx b/src/App/Resources/AppResources.mr.resx
index 120728203af..8cefdfe2a00 100644
--- a/src/App/Resources/AppResources.mr.resx
+++ b/src/App/Resources/AppResources.mr.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.my.resx b/src/App/Resources/AppResources.my.resx
index 6cfe82ce695..aa8c6ff88c5 100644
--- a/src/App/Resources/AppResources.my.resx
+++ b/src/App/Resources/AppResources.my.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.nb.resx b/src/App/Resources/AppResources.nb.resx
index 5e647715786..593fffb6a2d 100644
--- a/src/App/Resources/AppResources.nb.resx
+++ b/src/App/Resources/AppResources.nb.resx
@@ -954,6 +954,9 @@ Skanning skjer automatisk.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Du kan ikke bruke denne funksjonen før du oppdaterer krypteringsnøkkelen din.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Lær mer</value>
   </data>
@@ -2762,4 +2765,10 @@ Vil du bytte til denne kontoen?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logger inn på</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>For mange forsøk</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Konto logget ut.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ne.resx b/src/App/Resources/AppResources.ne.resx
index 6cfe82ce695..aa8c6ff88c5 100644
--- a/src/App/Resources/AppResources.ne.resx
+++ b/src/App/Resources/AppResources.ne.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.nl.resx b/src/App/Resources/AppResources.nl.resx
index b268861f74c..6d98931f2b6 100644
--- a/src/App/Resources/AppResources.nl.resx
+++ b/src/App/Resources/AppResources.nl.resx
@@ -954,6 +954,9 @@ Het scannen gebeurt automatisch.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Je kunt deze functie pas gebruiken als je je encryptiesleutel bijwerkt.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Meer informatie</value>
   </data>
@@ -2761,4 +2764,10 @@ Wilt u naar dit account wisselen?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.nn.resx b/src/App/Resources/AppResources.nn.resx
index f6791713bc8..7f0356f3cb2 100644
--- a/src/App/Resources/AppResources.nn.resx
+++ b/src/App/Resources/AppResources.nn.resx
@@ -954,6 +954,9 @@ Skanning skjer automatisk.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Du kan ikkje bruka denne funksjonen før du rettar enkrypteringsnykelen din.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Ler meir</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.or.resx b/src/App/Resources/AppResources.or.resx
index ce881ab27f9..b01514f5230 100644
--- a/src/App/Resources/AppResources.or.resx
+++ b/src/App/Resources/AppResources.or.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.pl.resx b/src/App/Resources/AppResources.pl.resx
index 666d27b4381..f9e0b1c3474 100644
--- a/src/App/Resources/AppResources.pl.resx
+++ b/src/App/Resources/AppResources.pl.resx
@@ -954,6 +954,9 @@ Skanowanie nastąpi automatycznie.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Nie możesz używać tej funkcji, dopóki nie zaktualizujesz klucza szyfrowania.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Wymagana jest migracja klucza szyfrowania. Zaloguj się przez sejf internetowy, aby zaktualizować klucz szyfrowania.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Dowiedz się więcej</value>
   </data>
@@ -2761,4 +2764,10 @@ Czy chcesz przełączyć się na to konto?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logowanie do</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Zbyt wiele prób</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Konto wylogowane.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.pt-BR.resx b/src/App/Resources/AppResources.pt-BR.resx
index 9d6d5947c6e..c13b1899d23 100644
--- a/src/App/Resources/AppResources.pt-BR.resx
+++ b/src/App/Resources/AppResources.pt-BR.resx
@@ -954,6 +954,9 @@ A leitura será feita automaticamente.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Você não pode usar esse recurso, até você atualizar sua chave de criptografia.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Saiba Mais</value>
   </data>
@@ -2762,4 +2765,10 @@ Você deseja mudar para esta conta?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Entrando em</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.pt-PT.resx b/src/App/Resources/AppResources.pt-PT.resx
index 0693064e069..98fd74230c1 100644
--- a/src/App/Resources/AppResources.pt-PT.resx
+++ b/src/App/Resources/AppResources.pt-PT.resx
@@ -954,6 +954,9 @@ A leitura será efetuada automaticamente.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Não pode utilizar esta funcionalidade até atualizar a sua chave de encriptação.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>É necessária a migração da chave de encriptação. Inicie sessão através do cofre Web para atualizar a sua chave de encriptação.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Saber mais</value>
   </data>
@@ -2760,4 +2763,10 @@ Deseja mudar para esta conta?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>A iniciar sessão em</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Demasiadas tentativas</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Conta com sessão terminada.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 9bdd360aa97..2f0b46978b9 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2654,7 +2657,7 @@ Do you want to switch to this account?</value>
   </data>
   <data name="CreatedX" xml:space="preserve">
     <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
+    <comment>DEPRECATED To state the date in which the cipher was created: Created 03/21/2023</comment>
   </data>
   <data name="Application" xml:space="preserve">
     <value>Application</value>
@@ -2783,4 +2786,14 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="CreatedXY" xml:space="preserve">
+    <value>Created {0}, {1}</value>
+    <comment>To state the date/time in which the cipher was created: Created 03/21/2023, 09:25 AM. First parameter is the date and the second parameter is the time.</comment>
+  </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ro.resx b/src/App/Resources/AppResources.ro.resx
index d529045ddc9..aa7221ff333 100644
--- a/src/App/Resources/AppResources.ro.resx
+++ b/src/App/Resources/AppResources.ro.resx
@@ -954,6 +954,9 @@ Scanarea se va face automat.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Nu puteți utiliza această caracteristică înainte de a actualiza cheia de criptare.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Aflați mai multe</value>
   </data>
@@ -2761,4 +2764,10 @@ Doriți să comutați la acest cont?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ru.resx b/src/App/Resources/AppResources.ru.resx
index 06ed765236f..7bb37d8be34 100644
--- a/src/App/Resources/AppResources.ru.resx
+++ b/src/App/Resources/AppResources.ru.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Вы не можете использовать эту функцию, пока не обновите свой ключ шифрования.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Требуется миграция ключа шифрования. Чтобы обновить ключ шифрования, войдите через веб-хранилище.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Узнать больше</value>
   </data>
@@ -2761,4 +2764,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>Войти на</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Слишком много попыток</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Аккаунт не авторизован.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.si.resx b/src/App/Resources/AppResources.si.resx
index f99ceb33742..ce443d69d73 100644
--- a/src/App/Resources/AppResources.si.resx
+++ b/src/App/Resources/AppResources.si.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.sk.resx b/src/App/Resources/AppResources.sk.resx
index ce60ed63f0f..b16326e9e43 100644
--- a/src/App/Resources/AppResources.sk.resx
+++ b/src/App/Resources/AppResources.sk.resx
@@ -954,6 +954,9 @@ Skenovanie prebehne automaticky.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Túto funkciu nemožno použiť, kým neaktualizujete svoj šifrovací kľúč.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Vyžaduje sa migrácia šifrovacieho kľúča. Na aktualizáciu šifrovacieho kľúča sa prihláste cez webový trezor.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Zistiť viac</value>
   </data>
@@ -2761,4 +2764,10 @@ Chcete prepnúť na toto konto?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Prihlásenie na</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Príliš veľa pokusov</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Účet bol odhlásený.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.sl.resx b/src/App/Resources/AppResources.sl.resx
index cabddb326e1..81577d6986e 100644
--- a/src/App/Resources/AppResources.sl.resx
+++ b/src/App/Resources/AppResources.sl.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Te funkcije ne morete koristiti, dokler dokler ne posodobite vašega ključa za šifriranje.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Preberite več</value>
   </data>
@@ -2761,4 +2764,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.sr.resx b/src/App/Resources/AppResources.sr.resx
index 4b826958b89..4976c54a39c 100644
--- a/src/App/Resources/AppResources.sr.resx
+++ b/src/App/Resources/AppResources.sr.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Не можете да користите ову способност док не промените Ваш кључ за шифровање.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Сазнај више</value>
   </data>
@@ -2763,4 +2766,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.sv.resx b/src/App/Resources/AppResources.sv.resx
index d5637a92672..ccb76c52782 100644
--- a/src/App/Resources/AppResources.sv.resx
+++ b/src/App/Resources/AppResources.sv.resx
@@ -955,6 +955,9 @@ Skanningen sker automatiskt.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Du kan inte använda denna funktion förrän du uppdaterar din krypteringsnyckel.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Migrering av krypteringsnyckel krävs. Logga in på webbvalvet för att uppdatera din krypteringsnyckel.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Läs mer</value>
   </data>
@@ -2763,4 +2766,10 @@ Vill du byta till detta konto?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logga in på</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>För många försök</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.ta.resx b/src/App/Resources/AppResources.ta.resx
index f9d1771579b..3e2dfccdcae 100644
--- a/src/App/Resources/AppResources.ta.resx
+++ b/src/App/Resources/AppResources.ta.resx
@@ -955,6 +955,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>உங்கள் குறியாக்க விசையை புதுப்பிக்கும் வரை இந்த அம்சத்தைப் பயன்படுத்த முடியாது.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>மேலும் அறிக</value>
   </data>
@@ -2762,4 +2765,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>இதில் உள்நுழைகிறது</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.te.resx b/src/App/Resources/AppResources.te.resx
index 6cfe82ce695..aa8c6ff88c5 100644
--- a/src/App/Resources/AppResources.te.resx
+++ b/src/App/Resources/AppResources.te.resx
@@ -954,6 +954,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>You cannot use this feature until you update your encryption key.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
@@ -2762,4 +2765,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.th.resx b/src/App/Resources/AppResources.th.resx
index f8ff3bedec2..2da7692f35e 100644
--- a/src/App/Resources/AppResources.th.resx
+++ b/src/App/Resources/AppResources.th.resx
@@ -957,6 +957,9 @@ Scanning will happen automatically.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>คุณไม่สามารถใช้คุณลักษณะนี้ได้จนกว่าคุณปรับปรุงคีย์การเข้ารหัสลับของคุณ</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>เรียน​รู้​เพิ่ม​เติม</value>
   </data>
@@ -2769,4 +2772,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.tr.resx b/src/App/Resources/AppResources.tr.resx
index 540f420cc21..10195911c8f 100644
--- a/src/App/Resources/AppResources.tr.resx
+++ b/src/App/Resources/AppResources.tr.resx
@@ -954,6 +954,9 @@ Kod otomatik olarak taranacaktır.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Şifreleme anahtarınızı güncelleştirene kadar bu özelliği kullanamazsınız.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Şifreleme anahtarınızın güncellenmesi gerekiyor. Şifreleme anahtarınızı güncellemek için lütfen web kasasına giriş yapın.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Daha fazla bilgi al</value>
   </data>
@@ -2760,4 +2763,10 @@ Bu hesaba geçmek ister misiniz?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Çok fazla deneme</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Hesabın oturumu kapatıldı.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.uk.resx b/src/App/Resources/AppResources.uk.resx
index bb97b533355..57dfb2e5147 100644
--- a/src/App/Resources/AppResources.uk.resx
+++ b/src/App/Resources/AppResources.uk.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>Ви не можете використовувати цю функцію доки не оновите свій ключ шифрування.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Потрібно перенести ключ шифрування. Увійдіть у вебсховище та оновіть свій ключ шифрування.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Докладніше</value>
   </data>
@@ -2761,4 +2764,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>Увійти на</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Забагато спроб</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Ви вийшли з облікового запису.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.vi.resx b/src/App/Resources/AppResources.vi.resx
index 691fec4d9fc..e956fd6001d 100644
--- a/src/App/Resources/AppResources.vi.resx
+++ b/src/App/Resources/AppResources.vi.resx
@@ -954,6 +954,9 @@ Quá trình quét sẽ diễn ra tự động.</value>
   <data name="UpdateKey" xml:space="preserve">
     <value>Bạn không thể sử dụng tính năng này cho đến khi bạn cập nhật khoá mã hóa.</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>Tìm Hiểu Thêm</value>
   </data>
@@ -2761,4 +2764,10 @@ Do you want to switch to this account?</value>
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>Too many attempts</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>Account logged out.</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.zh-Hans.resx b/src/App/Resources/AppResources.zh-Hans.resx
index b354702c754..f136721dc89 100644
--- a/src/App/Resources/AppResources.zh-Hans.resx
+++ b/src/App/Resources/AppResources.zh-Hans.resx
@@ -823,7 +823,7 @@
     <comment>For 2FA</comment>
   </data>
   <data name="EnterVerificationCodeEmail" xml:space="preserve">
-    <value>请输入发送到电子邮件 {0} 的 6 位验证码。</value>
+    <value>请输入发送给电子邮件 {0} 的 6 位数验证码。</value>
     <comment>For 2FA</comment>
   </data>
   <data name="LoginUnavailable" xml:space="preserve">
@@ -852,7 +852,7 @@
     <value>使用其他两步登录方式</value>
   </data>
   <data name="VerificationEmailNotSent" xml:space="preserve">
-    <value>无法发送验证电子邮件。请再试一次。</value>
+    <value>无法发送验证电子邮件。请重试。</value>
     <comment>For 2FA</comment>
   </data>
   <data name="VerificationEmailSent" xml:space="preserve">
@@ -867,7 +867,7 @@
     <comment>"YubiKey" is the product name and should not be translated.</comment>
   </data>
   <data name="AddNewAttachment" xml:space="preserve">
-    <value>添加新的附件</value>
+    <value>添加新附件</value>
   </data>
   <data name="Attachments" xml:space="preserve">
     <value>附件</value>
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>在您更新加密密钥前，您不能使用此功能。</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>需要迁移加密密钥。请登录网页版密码库来更新您的加密密钥。</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>了解更多信息</value>
   </data>
@@ -1489,7 +1492,7 @@
     <value>30 分钟</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
-    <value>设定您用来解锁 Bitwarden 的 PIN 码。您的 PIN 设置将在您退出账户时被重置。</value>
+    <value>设定您用来解锁 Bitwarden 的 PIN 码。您的 PIN 设置将在您完全注销此应用程序时被重置。</value>
   </data>
   <data name="LoggedInAsOn" xml:space="preserve">
     <value>已在 {1} 上以 {0} 身份登录。</value>
@@ -1984,7 +1987,7 @@
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AddASend" xml:space="preserve">
-    <value>新增 Send</value>
+    <value>添加 Send</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="CopyLink" xml:space="preserve">
@@ -2170,7 +2173,7 @@
     <value>账户已锁定</value>
   </data>
   <data name="AccountLoggedOutSuccessfully" xml:space="preserve">
-    <value>成功退出账户</value>
+    <value>账户注销成功</value>
   </data>
   <data name="AccountRemovedSuccessfully" xml:space="preserve">
     <value>账户移除成功</value>
@@ -2218,7 +2221,7 @@
     <value>验证码已发送到您的电子邮箱</value>
   </data>
   <data name="AnErrorOccurredWhileSendingAVerificationCodeToYourEmailPleaseTryAgain" xml:space="preserve">
-    <value>发送验证码到您的电子邮箱时发生错误。请再试一次</value>
+    <value>发送验证码到您的电子邮箱时发生错误。请重试</value>
   </data>
   <data name="EnterTheVerificationCodeThatWasSentToYourEmail" xml:space="preserve">
     <value>输入发送到您电子邮箱的验证码</value>
@@ -2309,10 +2312,10 @@
     <value>将锁定选项设置为「从不」可让任何能够访问您的设备的人都可以使用您的密码库。如果您使用此选项，则应确保您的设备得到妥善的保护。</value>
   </data>
   <data name="EnvironmentPageUrlsError" xml:space="preserve">
-    <value>输入的一个或多个 URL 无效。请修改后再次保存。</value>
+    <value>输入的一个或多个 URL 无效。请修改后再次尝试保存。</value>
   </data>
   <data name="GenericErrorMessage" xml:space="preserve">
-    <value>我们无法处理您的请求。请再试一次或联系我们。</value>
+    <value>我们无法处理您的请求。请重试或联系我们。</value>
   </data>
   <data name="AllowScreenCapture" xml:space="preserve">
     <value>允许屏幕截图</value>
@@ -2499,7 +2502,7 @@
     <value>不是你？</value>
   </data>
   <data name="LogInWithMasterPassword" xml:space="preserve">
-    <value>使用主密码登录</value>
+    <value>主密码登录</value>
   </data>
   <data name="LogInWithAnotherDevice" xml:space="preserve">
     <value>设备登录</value>
@@ -2761,4 +2764,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>登录到</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>尝试次数过多</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>账户已注销。</value>
+  </data>
 </root>
diff --git a/src/App/Resources/AppResources.zh-Hant.resx b/src/App/Resources/AppResources.zh-Hant.resx
index e8fe39072c3..02588567b11 100644
--- a/src/App/Resources/AppResources.zh-Hant.resx
+++ b/src/App/Resources/AppResources.zh-Hant.resx
@@ -954,6 +954,9 @@
   <data name="UpdateKey" xml:space="preserve">
     <value>更新加密金鑰前不能使用此功能。</value>
   </data>
+  <data name="EncryptionKeyMigrationRequiredDescriptionLong" xml:space="preserve">
+    <value>Encryption key migration required. Please login through the web vault to update your encryption key.</value>
+  </data>
   <data name="LearnMore" xml:space="preserve">
     <value>深入了解</value>
   </data>
@@ -2761,4 +2764,10 @@
   <data name="LoggingInOn" xml:space="preserve">
     <value>Logging in on</value>
   </data>
+  <data name="TooManyAttempts" xml:space="preserve">
+    <value>嘗試次數過多</value>
+  </data>
+  <data name="AccountLoggedOutBiometricExceeded" xml:space="preserve">
+    <value>帳號已登出。</value>
+  </data>
 </root>
diff --git a/src/App/Services/MobilePlatformUtilsService.cs b/src/App/Services/MobilePlatformUtilsService.cs
index ea1a7e1dcf6..93d3201adc7 100644
--- a/src/App/Services/MobilePlatformUtilsService.cs
+++ b/src/App/Services/MobilePlatformUtilsService.cs
@@ -32,7 +32,8 @@ public MobilePlatformUtilsService(
             IDeviceActionService deviceActionService,
             IClipboardService clipboardService,
             IMessagingService messagingService,
-            IBroadcasterService broadcasterService)
+            IBroadcasterService broadcasterService
+            )
         {
             _deviceActionService = deviceActionService;
             _clipboardService = clipboardService;
@@ -242,7 +243,7 @@ public async Task<bool> IsBiometricIntegrityValidAsync(string bioIntegritySrcKey
         }
 
         public async Task<bool> AuthenticateBiometricAsync(string text = null, string fallbackText = null,
-            Action fallback = null)
+            Action fallback = null, bool logOutOnTooManyAttempts = false)
         {
             try
             {
@@ -269,6 +270,12 @@ public async Task<bool> AuthenticateBiometricAsync(string text = null, string fa
                 {
                     fallback?.Invoke();
                 }
+                if (result.Status == FingerprintAuthenticationResultStatus.TooManyAttempts
+                    && logOutOnTooManyAttempts)
+                {
+                    await ShowDialogAsync(AppResources.AccountLoggedOutBiometricExceeded, AppResources.TooManyAttempts, AppResources.Ok);
+                    _messagingService.Send(AccountsManagerMessageCommands.LOGOUT);
+                }
             }
             catch { }
             return false;
diff --git a/src/App/Utilities/AppHelpers.cs b/src/App/Utilities/AppHelpers.cs
index 67e152b56c8..eac563800b1 100644
--- a/src/App/Utilities/AppHelpers.cs
+++ b/src/App/Utilities/AppHelpers.cs
@@ -15,6 +15,7 @@
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.View;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 using Xamarin.Essentials;
@@ -78,17 +79,6 @@ public static async Task<string> CipherListOptions(ContentPage page, CipherView
                     options.Add(AppResources.CopyNotes);
                 }
             }
-            if (cipher.Type == Core.Enums.CipherType.Fido2Key)
-            {
-                if (!string.IsNullOrWhiteSpace(cipher.Fido2Key.UserName))
-                {
-                    options.Add(AppResources.CopyUsername);
-                }
-                if (cipher.Fido2Key.CanLaunch)
-                {
-                    options.Add(AppResources.Launch);
-                }
-            }
 
             var selection = await page.DisplayActionSheet(cipher.Name, AppResources.Cancel, null, options.ToArray());
             if (await vaultTimeoutService.IsLockedAsync())
@@ -107,7 +97,7 @@ await passwordRepromptService.PromptAndCheckPasswordIfNeededAsync(cipher.Repromp
             }
             else if (selection == AppResources.CopyUsername)
             {
-                await clipboardService.CopyTextAsync(cipher.Type == CipherType.Login ? cipher.Login.Username : cipher.Fido2Key.UserName);
+                await clipboardService.CopyTextAsync(cipher.Login.Username);
                 platformUtilsService.ShowToastForCopiedValue(AppResources.Username);
             }
             else if (selection == AppResources.CopyPassword
diff --git a/src/App/Utilities/IconGlyphExtensions.cs b/src/App/Utilities/IconGlyphExtensions.cs
index d3b33f9f4c3..62a327d76e1 100644
--- a/src/App/Utilities/IconGlyphExtensions.cs
+++ b/src/App/Utilities/IconGlyphExtensions.cs
@@ -18,8 +18,6 @@ public static string GetIcon(this CipherView cipher)
                     return BitwardenIcons.CreditCard;
                 case CipherType.Identity:
                     return BitwardenIcons.IdCard;
-                case CipherType.Fido2Key:
-                    return BitwardenIcons.Passkey;
             }
             return null;
         }
diff --git a/src/App/Utilities/IconImageConverter.cs b/src/App/Utilities/IconImageConverter.cs
index 87ad2391b6b..0c4a98a2938 100644
--- a/src/App/Utilities/IconImageConverter.cs
+++ b/src/App/Utilities/IconImageConverter.cs
@@ -26,14 +26,12 @@ public static class IconImageHelper
     {
         public static string GetIconImage(CipherView cipher)
         {
-            switch (cipher.Type)
+            if (cipher.Type != CipherType.Login)
             {
-                case CipherType.Login:
-                    return IconImageHelper.GetLoginIconImage(cipher);
-                case CipherType.Fido2Key:
-                    return IconImageHelper.GetFido2KeyIconImage(cipher);
+                return null;
             }
-            return null;
+
+            return GetLoginIconImage(cipher);
         }
 
         public static string GetLoginIconImage(CipherView cipher)
@@ -65,26 +63,6 @@ public static string GetLoginIconImage(CipherView cipher)
             return image;
         }
 
-        public static string GetFido2KeyIconImage(CipherView cipher)
-        {
-            var hostnameUri = cipher.Fido2Key.LaunchUri;
-            if (!hostnameUri.Contains("."))
-            {
-                return null;
-            }
-
-            if (!hostnameUri.Contains("://"))
-            {
-                hostnameUri = string.Concat("https://", hostnameUri);
-            }
-            if (hostnameUri.StartsWith("http"))
-            {
-                return GetIconUrl(hostnameUri);
-            }
-
-            return null;
-        }
-
         private static string GetIconUrl(string hostnameUri)
         {
             IEnvironmentService _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
diff --git a/src/Core/Abstractions/IApiService.cs b/src/Core/Abstractions/IApiService.cs
index c1ede0e05e2..b4deb8e9b94 100644
--- a/src/Core/Abstractions/IApiService.cs
+++ b/src/Core/Abstractions/IApiService.cs
@@ -50,7 +50,7 @@ public interface IApiService
         Task RefreshIdentityTokenAsync();
         Task<SsoPrevalidateResponse> PreValidateSsoAsync(string identifier);
         Task<TResponse> SendAsync<TRequest, TResponse>(HttpMethod method, string path,
-            TRequest body, bool authed, bool hasResponse, Action<HttpRequestMessage> alterRequest, bool logoutOnUnauthorized = true);
+            TRequest body, bool authed, bool hasResponse, Action<HttpRequestMessage> alterRequest, bool logoutOnUnauthorized = true, bool sendToIdentity = false);
         Task<HttpResponseMessage> SendAsync(HttpRequestMessage requestMessage, CancellationToken cancellationToken = default);
         void SetUrls(EnvironmentUrls urls);
         [Obsolete("Mar 25 2021: This method has been deprecated in favor of direct uploads. This method still exists for backward compatibility with old server versions.")]
diff --git a/src/Core/Abstractions/ICryptoService.cs b/src/Core/Abstractions/ICryptoService.cs
index 282447d402c..66582bdf9c4 100644
--- a/src/Core/Abstractions/ICryptoService.cs
+++ b/src/Core/Abstractions/ICryptoService.cs
@@ -13,6 +13,7 @@ public interface ICryptoService
         Task RefreshKeysAsync();
         Task SetUserKeyAsync(UserKey userKey, string userId = null);
         Task<UserKey> GetUserKeyAsync(string userId = null);
+        Task<bool> IsLegacyUserAsync(MasterKey masterKey = null, string userId = null);
         Task<UserKey> GetUserKeyWithLegacySupportAsync(string userId = null);
         Task<bool> HasUserKeyAsync(string userId = null);
         Task<bool> HasEncryptedUserKeyAsync(string userId = null);
diff --git a/src/Core/Abstractions/IPlatformUtilsService.cs b/src/Core/Abstractions/IPlatformUtilsService.cs
index 2e8e8e7f61c..3432238faca 100644
--- a/src/Core/Abstractions/IPlatformUtilsService.cs
+++ b/src/Core/Abstractions/IPlatformUtilsService.cs
@@ -29,7 +29,7 @@ Task<bool> ShowDialogAsync(string text, string title = null, string confirmText
         bool SupportsDuo();
         Task<bool> SupportsBiometricAsync();
         Task<bool> IsBiometricIntegrityValidAsync(string bioIntegritySrcKey = null);
-        Task<bool> AuthenticateBiometricAsync(string text = null, string fallbackText = null, Action fallback = null);
+        Task<bool> AuthenticateBiometricAsync(string text = null, string fallbackText = null, Action fallback = null, bool logOutOnTooManyAttempts = false);
         long GetActiveTime();
     }
 }
diff --git a/src/Core/Enums/CipherType.cs b/src/Core/Enums/CipherType.cs
index cefa35182ea..0aca9486408 100644
--- a/src/Core/Enums/CipherType.cs
+++ b/src/Core/Enums/CipherType.cs
@@ -7,7 +7,6 @@ public enum CipherType : byte
         Login = 1,
         SecureNote = 2,
         Card = 3,
-        Identity = 4,
-        Fido2Key = 5
+        Identity = 4
     }
 }
diff --git a/src/Core/Exceptions/LegacyUserException.cs b/src/Core/Exceptions/LegacyUserException.cs
new file mode 100644
index 00000000000..cad0b6c862b
--- /dev/null
+++ b/src/Core/Exceptions/LegacyUserException.cs
@@ -0,0 +1,11 @@
+using System;
+namespace Bit.Core.Exceptions
+{
+    public class LegacyUserException : Exception
+    {
+        public LegacyUserException()
+            : base("Legacy users must migrate on web vault.")
+        {
+        }
+    }
+}
diff --git a/src/Core/Models/Api/Fido2KeyApi.cs b/src/Core/Models/Api/Fido2KeyApi.cs
index 61f2444afcc..40c5595d07f 100644
--- a/src/Core/Models/Api/Fido2KeyApi.cs
+++ b/src/Core/Models/Api/Fido2KeyApi.cs
@@ -1,5 +1,4 @@
 using Bit.Core.Models.Domain;
-using Bit.Core.Models.Export;
 
 namespace Bit.Core.Models.Api
 {
@@ -11,7 +10,8 @@ public Fido2KeyApi()
 
         public Fido2KeyApi(Fido2Key fido2Key)
         {
-            NonDiscoverableId = fido2Key.NonDiscoverableId?.EncryptedString;
+            CredentialId = fido2Key.CredentialId?.EncryptedString;
+            Discoverable = fido2Key.Discoverable?.EncryptedString;
             KeyType = fido2Key.KeyType?.EncryptedString;
             KeyAlgorithm = fido2Key.KeyAlgorithm?.EncryptedString;
             KeyCurve = fido2Key.KeyCurve?.EncryptedString;
@@ -23,7 +23,8 @@ public Fido2KeyApi(Fido2Key fido2Key)
             Counter = fido2Key.Counter?.EncryptedString;
         }
 
-        public string NonDiscoverableId { get; set; }
+        public string CredentialId { get; set; }
+        public string Discoverable { get; set; }
         public string KeyType { get; set; } = Constants.DefaultFido2KeyType;
         public string KeyAlgorithm { get; set; } = Constants.DefaultFido2KeyAlgorithm;
         public string KeyCurve { get; set; } = Constants.DefaultFido2KeyCurve;
diff --git a/src/Core/Models/Api/LoginApi.cs b/src/Core/Models/Api/LoginApi.cs
index 42d32f34330..2ebefc0c318 100644
--- a/src/Core/Models/Api/LoginApi.cs
+++ b/src/Core/Models/Api/LoginApi.cs
@@ -10,6 +10,6 @@ public class LoginApi
         public string Password { get; set; }
         public DateTime? PasswordRevisionDate { get; set; }
         public string Totp { get; set; }
-        public Fido2KeyApi Fido2Key { get; set; }
+        public List<Fido2KeyApi> Fido2Keys { get; set; }
     }
 }
diff --git a/src/Core/Models/Data/CipherData.cs b/src/Core/Models/Data/CipherData.cs
index f8bd1a648e0..4b052b4eeb3 100644
--- a/src/Core/Models/Data/CipherData.cs
+++ b/src/Core/Models/Data/CipherData.cs
@@ -45,9 +45,6 @@ public CipherData(CipherResponse response, string userId = null, HashSet<string>
                     case Enums.CipherType.Identity:
                         Identity = new IdentityData(response.Identity);
                         break;
-                    case Enums.CipherType.Fido2Key:
-                        Fido2Key = new Fido2KeyData(response.Fido2Key);
-                        break;
                     default:
                         break;
                 }
@@ -86,7 +83,6 @@ public CipherData(CipherResponse response, string userId = null, HashSet<string>
         public SecureNoteData SecureNote { get; set; }
         public CardData Card { get; set; }
         public IdentityData Identity { get; set; }
-        public Fido2KeyData Fido2Key { get; set; }
         public List<FieldData> Fields { get; set; }
         public List<AttachmentData> Attachments { get; set; }
         public List<PasswordHistoryData> PasswordHistory { get; set; }
diff --git a/src/Core/Models/Data/Fido2KeyData.cs b/src/Core/Models/Data/Fido2KeyData.cs
index 234406eeec5..aa1fd8e393d 100644
--- a/src/Core/Models/Data/Fido2KeyData.cs
+++ b/src/Core/Models/Data/Fido2KeyData.cs
@@ -8,7 +8,8 @@ public Fido2KeyData() { }
 
         public Fido2KeyData(Fido2KeyApi apiData)
         {
-            NonDiscoverableId = apiData.NonDiscoverableId;
+            CredentialId = apiData.CredentialId;
+            Discoverable = apiData.Discoverable;
             KeyType = apiData.KeyType;
             KeyAlgorithm = apiData.KeyAlgorithm;
             KeyCurve = apiData.KeyCurve;
@@ -20,7 +21,8 @@ public Fido2KeyData(Fido2KeyApi apiData)
             Counter = apiData.Counter;
         }
 
-        public string NonDiscoverableId { get; set; }
+        public string CredentialId { get; set; }
+        public string Discoverable { get; set; }
         public string KeyType { get; set; } = Constants.DefaultFido2KeyType;
         public string KeyAlgorithm { get; set; } = Constants.DefaultFido2KeyAlgorithm;
         public string KeyCurve { get; set; } = Constants.DefaultFido2KeyCurve;
diff --git a/src/Core/Models/Data/LoginData.cs b/src/Core/Models/Data/LoginData.cs
index 1460e0b1760..bc71df1af4b 100644
--- a/src/Core/Models/Data/LoginData.cs
+++ b/src/Core/Models/Data/LoginData.cs
@@ -16,7 +16,7 @@ public LoginData(LoginApi data)
             PasswordRevisionDate = data.PasswordRevisionDate;
             Totp = data.Totp;
             Uris = data.Uris?.Select(u => new LoginUriData(u)).ToList();
-            Fido2Key = data.Fido2Key != null ? new Fido2KeyData(data.Fido2Key) : null;
+            Fido2Keys = data.Fido2Keys?.Select(f => new Fido2KeyData(f)).ToList();
         }
 
         public List<LoginUriData> Uris { get; set; }
@@ -24,6 +24,6 @@ public LoginData(LoginApi data)
         public string Password { get; set; }
         public DateTime? PasswordRevisionDate { get; set; }
         public string Totp { get; set; }
-        public Fido2KeyData Fido2Key { get; set; }
+        public List<Fido2KeyData> Fido2Keys { get; set; }
     }
 }
diff --git a/src/Core/Models/Domain/AuthResult.cs b/src/Core/Models/Domain/AuthResult.cs
index 8f3a6bc50e4..adad6bef61c 100644
--- a/src/Core/Models/Domain/AuthResult.cs
+++ b/src/Core/Models/Domain/AuthResult.cs
@@ -13,6 +13,7 @@ public class AuthResult
         [Obsolete("Use AccountDecryptionOptions to determine if the user does not have a MP")]
         public bool ResetMasterPassword { get; set; }
         public bool ForcePasswordReset { get; set; }
+        public bool RequiresEncryptionKeyMigration { get; set; }
         public Dictionary<TwoFactorProviderType, Dictionary<string, object>> TwoFactorProviders { get; set; }
     }
 }
diff --git a/src/Core/Models/Domain/Cipher.cs b/src/Core/Models/Domain/Cipher.cs
index a5b6fcba482..a9c0014db60 100644
--- a/src/Core/Models/Domain/Cipher.cs
+++ b/src/Core/Models/Domain/Cipher.cs
@@ -48,9 +48,6 @@ public Cipher(CipherData obj, bool alreadyEncrypted = false, Dictionary<string,
                 case Enums.CipherType.Identity:
                     Identity = new Identity(obj.Identity, alreadyEncrypted);
                     break;
-                case CipherType.Fido2Key:
-                    Fido2Key = new Fido2Key(obj.Fido2Key, alreadyEncrypted);
-                    break;
                 default:
                     break;
             }
@@ -66,7 +63,7 @@ public Cipher(CipherData obj, bool alreadyEncrypted = false, Dictionary<string,
         public string FolderId { get; set; }
         public EncString Name { get; set; }
         public EncString Notes { get; set; }
-        public Enums.CipherType Type { get; set; }
+        public CipherType Type { get; set; }
         public bool Favorite { get; set; }
         public bool OrganizationUseTotp { get; set; }
         public bool Edit { get; set; }
@@ -79,7 +76,6 @@ public Cipher(CipherData obj, bool alreadyEncrypted = false, Dictionary<string,
         public Identity Identity { get; set; }
         public Card Card { get; set; }
         public SecureNote SecureNote { get; set; }
-        public Fido2Key Fido2Key { get; set; }
         public List<Attachment> Attachments { get; set; }
         public List<Field> Fields { get; set; }
         public List<PasswordHistory> PasswordHistory { get; set; }
@@ -109,9 +105,6 @@ public async Task<CipherView> DecryptAsync()
                 case Enums.CipherType.Identity:
                     model.Identity = await Identity.DecryptAsync(OrganizationId);
                     break;
-                case Enums.CipherType.Fido2Key:
-                    model.Fido2Key = await Fido2Key.DecryptAsync(OrganizationId);
-                    break;
                 default:
                     break;
             }
@@ -201,9 +194,6 @@ public CipherData ToCipherData(string userId)
                 case Enums.CipherType.Identity:
                     c.Identity = Identity.ToIdentityData();
                     break;
-                case Enums.CipherType.Fido2Key:
-                    c.Fido2Key = Fido2Key.ToFido2KeyData();
-                    break;
                 default:
                     break;
             }
diff --git a/src/Core/Models/Domain/Fido2Key.cs b/src/Core/Models/Domain/Fido2Key.cs
index 05c5741dd69..80a6589f98b 100644
--- a/src/Core/Models/Domain/Fido2Key.cs
+++ b/src/Core/Models/Domain/Fido2Key.cs
@@ -9,7 +9,8 @@ public class Fido2Key : Domain
     {
         public static HashSet<string> EncryptableProperties => new HashSet<string>
         {
-            nameof(NonDiscoverableId),
+            nameof(CredentialId),
+            nameof(Discoverable),
             nameof(KeyType),
             nameof(KeyAlgorithm),
             nameof(KeyCurve),
@@ -28,7 +29,8 @@ public Fido2Key(Fido2KeyData data, bool alreadyEncrypted = false)
             BuildDomainModel(this, data, EncryptableProperties, alreadyEncrypted);
         }
 
-        public EncString NonDiscoverableId { get; set; }
+        public EncString CredentialId { get; set; }
+        public EncString Discoverable { get; set; }
         public EncString KeyType { get; set; }
         public EncString KeyAlgorithm { get; set; }
         public EncString KeyCurve { get; set; }
diff --git a/src/Core/Models/Domain/Login.cs b/src/Core/Models/Domain/Login.cs
index 9968f43a67f..ded94afe736 100644
--- a/src/Core/Models/Domain/Login.cs
+++ b/src/Core/Models/Domain/Login.cs
@@ -15,7 +15,7 @@ public Login(LoginData obj, bool alreadyEncrypted = false)
         {
             PasswordRevisionDate = obj.PasswordRevisionDate;
             Uris = obj.Uris?.Select(u => new LoginUri(u, alreadyEncrypted)).ToList();
-            Fido2Key = obj.Fido2Key != null ? new Fido2Key(obj.Fido2Key, alreadyEncrypted) : null;
+            Fido2Keys = obj.Fido2Keys?.Select(f => new Fido2Key(f, alreadyEncrypted)).ToList();
             BuildDomainModel(this, obj, new HashSet<string>
             {
                 "Username",
@@ -29,7 +29,7 @@ public Login(LoginData obj, bool alreadyEncrypted = false)
         public EncString Password { get; set; }
         public DateTime? PasswordRevisionDate { get; set; }
         public EncString Totp { get; set; }
-        public Fido2Key Fido2Key { get; set; }
+        public List<Fido2Key> Fido2Keys { get; set; }
 
         public async Task<LoginView> DecryptAsync(string orgId)
         {
@@ -47,9 +47,13 @@ public async Task<LoginView> DecryptAsync(string orgId)
                     view.Uris.Add(await uri.DecryptAsync(orgId));
                 }
             }
-            if (Fido2Key != null)
+            if (Fido2Keys != null)
             {
-                view.Fido2Key = await Fido2Key.DecryptAsync(orgId);
+                view.Fido2Keys = new List<Fido2KeyView>();
+                foreach (var fido2Key in Fido2Keys)
+                {
+                    view.Fido2Keys.Add(await fido2Key.DecryptAsync(orgId));
+                }
             }
             return view;
         }
@@ -68,9 +72,9 @@ public LoginData ToLoginData()
             {
                 l.Uris = Uris.Select(u => u.ToLoginUriData()).ToList();
             }
-            if (Fido2Key != null)
+            if (Fido2Keys != null)
             {
-                l.Fido2Key = Fido2Key.ToFido2KeyData();
+                l.Fido2Keys = Fido2Keys.Select(f => f.ToFido2KeyData()).ToList();
             }
             return l;
         }
diff --git a/src/Core/Models/Request/CipherRequest.cs b/src/Core/Models/Request/CipherRequest.cs
index 121abc2f806..0e5766bfe33 100644
--- a/src/Core/Models/Request/CipherRequest.cs
+++ b/src/Core/Models/Request/CipherRequest.cs
@@ -31,7 +31,7 @@ public CipherRequest(Cipher cipher)
                         Password = cipher.Login.Password?.EncryptedString,
                         PasswordRevisionDate = cipher.Login.PasswordRevisionDate,
                         Totp = cipher.Login.Totp?.EncryptedString,
-                        Fido2Key = cipher.Login.Fido2Key != null ? new Fido2KeyApi(cipher.Login.Fido2Key) : null
+                        Fido2Keys = cipher.Login.Fido2Keys?.Select(f => new Fido2KeyApi(f)).ToList()
                     };
                     break;
                 case CipherType.Card:
@@ -74,9 +74,6 @@ public CipherRequest(Cipher cipher)
                         Type = cipher.SecureNote.Type
                     };
                     break;
-                case CipherType.Fido2Key:
-                    Fido2Key = new Fido2KeyApi(cipher.Fido2Key);
-                    break;
                 default:
                     break;
             }
@@ -122,7 +119,6 @@ public CipherRequest(Cipher cipher)
         public SecureNoteApi SecureNote { get; set; }
         public CardApi Card { get; set; }
         public IdentityApi Identity { get; set; }
-        public Fido2KeyApi Fido2Key { get; set; }
         public List<FieldApi> Fields { get; set; }
         public List<PasswordHistoryRequest> PasswordHistory { get; set; }
         public Dictionary<string, string> Attachments { get; set; }
diff --git a/src/Core/Models/Response/CipherResponse.cs b/src/Core/Models/Response/CipherResponse.cs
index 5247c452253..f9c481114d6 100644
--- a/src/Core/Models/Response/CipherResponse.cs
+++ b/src/Core/Models/Response/CipherResponse.cs
@@ -18,7 +18,6 @@ public class CipherResponse
         public CardApi Card { get; set; }
         public IdentityApi Identity { get; set; }
         public SecureNoteApi SecureNote { get; set; }
-        public Fido2KeyApi Fido2Key { get; set; }
         public bool Favorite { get; set; }
         public bool Edit { get; set; }
         public bool ViewPassword { get; set; } = true; // Fallback for old server versions
diff --git a/src/Core/Models/View/AccountView.cs b/src/Core/Models/View/AccountView.cs
index 7224d51bd08..958f1435d16 100644
--- a/src/Core/Models/View/AccountView.cs
+++ b/src/Core/Models/View/AccountView.cs
@@ -1,4 +1,5 @@
 using Bit.Core.Enums;
+using Bit.Core.Models.Data;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
 
@@ -21,14 +22,21 @@ public AccountView(Account a = null, bool isActive = false)
             Email = a.Profile?.Email;
             Name = a.Profile?.Name;
             AvatarColor = a.Profile?.AvatarColor;
-            if (!string.IsNullOrWhiteSpace(a.Settings?.EnvironmentUrls?.WebVault))
-            {
-                Hostname = CoreHelpers.GetHostname(a.Settings?.EnvironmentUrls?.WebVault);
-            }
-            else if (!string.IsNullOrWhiteSpace(a.Settings?.EnvironmentUrls?.Base))
+            Hostname = ParseEndpoint(a.Settings?.EnvironmentUrls);
+        }
+
+        private string ParseEndpoint(EnvironmentUrlData urls)
+        {
+            var url = urls?.WebVault ?? urls?.Base;
+            if (!string.IsNullOrWhiteSpace(url))
             {
-                Hostname = CoreHelpers.GetHostname(a.Settings?.EnvironmentUrls?.Base);
+                if (url.Contains("bitwarden.com") || url.Contains("bitwarden.eu"))
+                {
+                    return CoreHelpers.GetDomain(url);
+                }
+                return CoreHelpers.GetHostname(url);
             }
+            return string.Empty;
         }
 
         public bool IsAccount { get; set; }
diff --git a/src/Core/Models/View/CipherView.cs b/src/Core/Models/View/CipherView.cs
index 8e22028476e..88d2aa13749 100644
--- a/src/Core/Models/View/CipherView.cs
+++ b/src/Core/Models/View/CipherView.cs
@@ -43,7 +43,6 @@ public CipherView(Cipher c)
         public IdentityView Identity { get; set; }
         public CardView Card { get; set; }
         public SecureNoteView SecureNote { get; set; }
-        public Fido2KeyView Fido2Key { get; set; }
         public List<AttachmentView> Attachments { get; set; }
         public List<FieldView> Fields { get; set; }
         public List<PasswordHistoryView> PasswordHistory { get; set; }
@@ -67,8 +66,6 @@ public ItemView Item
                         return Card;
                     case CipherType.Identity:
                         return Identity;
-                    case CipherType.Fido2Key:
-                        return Fido2Key;
                     default:
                         break;
                 }
@@ -115,12 +112,14 @@ public string LinkedFieldI18nKey(LinkedIdType id)
             return LinkedFieldOptions.Find(lfo => lfo.Value == id).Key;
         }
 
-        public string ComparableName => Name + Login?.Username + Fido2Key?.UserName;
+        public string ComparableName => Name + Login?.Username;
 
-        public bool CanLaunch => Login?.CanLaunch == true || Fido2Key?.CanLaunch == true;
+        public bool CanLaunch => Login?.CanLaunch == true;
 
-        public string LaunchUri => Login?.LaunchUri ?? Fido2Key?.LaunchUri;
+        public string LaunchUri => Login?.LaunchUri;
 
-        public bool IsClonable => OrganizationId is null && Type != CipherType.Fido2Key;
+        public bool IsClonable => OrganizationId is null;
+
+        public bool HasFido2Key => Type == CipherType.Login && Login?.HasFido2Keys == true;
     }
 }
diff --git a/src/Core/Models/View/Fido2KeyView.cs b/src/Core/Models/View/Fido2KeyView.cs
index dcdddd8a8f8..20a4d0ee15a 100644
--- a/src/Core/Models/View/Fido2KeyView.cs
+++ b/src/Core/Models/View/Fido2KeyView.cs
@@ -5,7 +5,8 @@ namespace Bit.Core.Models.View
 {
     public class Fido2KeyView : ItemView, ILaunchableView
     {
-        public string NonDiscoverableId { get; set; }
+        public string CredentialId { get; set; }
+        public string Discoverable { get; set; }
         public string KeyType { get; set; } = Constants.DefaultFido2KeyType;
         public string KeyAlgorithm { get; set; } = Constants.DefaultFido2KeyAlgorithm;
         public string KeyCurve { get; set; } = Constants.DefaultFido2KeyCurve;
@@ -18,6 +19,7 @@ public class Fido2KeyView : ItemView, ILaunchableView
 
         public override string SubTitle => UserName;
         public override List<KeyValuePair<string, LinkedIdType>> LinkedFieldOptions => new List<KeyValuePair<string, LinkedIdType>>();
+        public bool IsDiscoverable => !string.IsNullOrWhiteSpace(Discoverable);
         public bool CanLaunch => !string.IsNullOrEmpty(RpId);
         public string LaunchUri => $"https://{RpId}";
 
diff --git a/src/Core/Models/View/LoginView.cs b/src/Core/Models/View/LoginView.cs
index 94a735dc60b..bece3a9ce34 100644
--- a/src/Core/Models/View/LoginView.cs
+++ b/src/Core/Models/View/LoginView.cs
@@ -20,7 +20,7 @@ public LoginView(Login l)
         public DateTime? PasswordRevisionDate { get; set; }
         public string Totp { get; set; }
         public List<LoginUriView> Uris { get; set; }
-        public Fido2KeyView Fido2Key { get; set; }
+        public List<Fido2KeyView> Fido2Keys { get; set; }
 
         public string Uri => HasUris ? Uris[0].Uri : null;
         public string MaskedPassword => Password != null ? "••••••••" : null;
@@ -28,6 +28,8 @@ public LoginView(Login l)
         public bool CanLaunch => HasUris && Uris.Any(u => u.CanLaunch);
         public string LaunchUri => HasUris ? Uris.FirstOrDefault(u => u.CanLaunch)?.LaunchUri : null;
         public bool HasUris => (Uris?.Count ?? 0) > 0;
+        public bool HasFido2Keys => Fido2Keys?.Any() == true;
+        public Fido2KeyView MainFido2Key => HasFido2Keys ? Fido2Keys[0] : null;
 
         public override List<KeyValuePair<string, LinkedIdType>> LinkedFieldOptions
         {
diff --git a/src/Core/Services/ApiService.cs b/src/Core/Services/ApiService.cs
index fcc743c37b2..eb7cca9e402 100644
--- a/src/Core/Services/ApiService.cs
+++ b/src/Core/Services/ApiService.cs
@@ -169,7 +169,7 @@ public Task<ProfileResponse> GetProfileAsync()
         public Task<PreloginResponse> PostPreloginAsync(PreloginRequest request)
         {
             return SendAsync<PreloginRequest, PreloginResponse>(HttpMethod.Post, "/accounts/prelogin",
-                request, false, true);
+                request, false, true, sendToIdentity: true);
         }
 
         public Task<long> GetAccountRevisionDateAsync()
@@ -191,7 +191,7 @@ public Task SetPasswordAsync(SetPasswordRequest request)
 
         public Task PostRegisterAsync(RegisterRequest request)
         {
-            return SendAsync<RegisterRequest, object>(HttpMethod.Post, "/accounts/register", request, false, false);
+            return SendAsync<RegisterRequest, object>(HttpMethod.Post, "/accounts/register", request, false, false, sendToIdentity: true);
         }
 
         public Task PostAccountKeysAsync(KeysRequest request)
@@ -684,14 +684,15 @@ public Task SendAsync<TRequest>(HttpMethod method, string path, TRequest body, b
         public Task<TResponse> SendAsync<TResponse>(HttpMethod method, string path, bool authed) =>
             SendAsync<object, TResponse>(method, path, null, authed, true);
         public async Task<TResponse> SendAsync<TRequest, TResponse>(HttpMethod method, string path, TRequest body,
-            bool authed, bool hasResponse, Action<HttpRequestMessage> alterRequest = null, bool logoutOnUnauthorized = true)
+            bool authed, bool hasResponse, Action<HttpRequestMessage> alterRequest = null, bool logoutOnUnauthorized = true, bool sendToIdentity = false)
         {
             using (var requestMessage = new HttpRequestMessage())
             {
+                var baseUrl = sendToIdentity ? IdentityBaseUrl : ApiBaseUrl;
                 requestMessage.Version = new Version(1, 0);
                 requestMessage.Method = method;
 
-                if (!Uri.IsWellFormedUriString(ApiBaseUrl, UriKind.Absolute))
+                if (!Uri.IsWellFormedUriString(baseUrl, UriKind.Absolute))
                 {
                     throw new ApiException(new ErrorResponse
                     {
@@ -701,7 +702,7 @@ public async Task<TResponse> SendAsync<TRequest, TResponse>(HttpMethod method, s
                     });
                 }
 
-                requestMessage.RequestUri = new Uri(string.Concat(ApiBaseUrl, path));
+                requestMessage.RequestUri = new Uri(string.Concat(baseUrl, path));
 
                 if (body != null)
                 {
diff --git a/src/Core/Services/AuthService.cs b/src/Core/Services/AuthService.cs
index f89d25ed64d..bc037fd2b2f 100644
--- a/src/Core/Services/AuthService.cs
+++ b/src/Core/Services/AuthService.cs
@@ -477,6 +477,17 @@ private async Task<AuthResult> LogInHelperAsync(string email, string hashedPassw
             }
 
             var tokenResponse = response.TokenResponse;
+            if (localHashedPassword != null && tokenResponse.Key == null)
+            {
+                // Only check for legacy if there is no key on token
+                if (await _cryptoService.IsLegacyUserAsync(masterKey))
+                {
+                    // Legacy users must migrate on web vault;
+                    result.RequiresEncryptionKeyMigration = true;
+                    return result;
+                }
+            }
+
             result.ResetMasterPassword = tokenResponse.ResetMasterPassword;
             result.ForcePasswordReset = tokenResponse.ForcePasswordReset;
             _masterPasswordPolicy = tokenResponse.MasterPasswordPolicy;
diff --git a/src/Core/Services/CipherService.cs b/src/Core/Services/CipherService.cs
index 7f63647632a..5033a01d66f 100644
--- a/src/Core/Services/CipherService.cs
+++ b/src/Core/Services/CipherService.cs
@@ -549,28 +549,15 @@ public async Task SaveWithServerAsync(Cipher cipher)
 
         private async Task<bool> ValidateCanBeSharedWithOrgAsync(CipherView cipher, string organizationId)
         {
-            if (cipher.Login?.Fido2Key is null && cipher.Fido2Key is null)
+            if (!cipher.HasFido2Key)
             {
                 return true;
             }
 
             var decCiphers = await GetAllDecryptedAsync();
-            var orgCiphers = decCiphers.Where(c => c.OrganizationId == organizationId);
-            if (cipher.Login?.Fido2Key != null)
-            {
-                return !orgCiphers.Any(c => !cipher.Login.Fido2Key.IsUniqueAgainst(c.Login?.Fido2Key)
-                                            ||
-                                            !cipher.Login.Fido2Key.IsUniqueAgainst(c.Fido2Key));
-            }
-
-            if (cipher.Fido2Key != null)
-            {
-                return !orgCiphers.Any(c => !cipher.Fido2Key.IsUniqueAgainst(c.Login?.Fido2Key)
-                                            ||
-                                            !cipher.Fido2Key.IsUniqueAgainst(c.Fido2Key));
-            }
-
-            return true;
+            return !decCiphers
+                .Where(c => c.OrganizationId == organizationId)
+                .Any(c => !cipher.Login.MainFido2Key.IsUniqueAgainst(c.Login?.MainFido2Key));
         }
 
         public async Task<Cipher> SaveAttachmentRawWithServerAsync(Cipher cipher, string filename, byte[] data)
@@ -1132,10 +1119,15 @@ private async Task EncryptCipherDataAsync(Cipher cipher, CipherView model, Symme
                             cipher.Login.Uris.Add(loginUri);
                         }
                     }
-                    if (model.Login.Fido2Key != null)
+                    if (model.Login.HasFido2Keys)
                     {
-                        cipher.Login.Fido2Key = new Fido2Key();
-                        await EncryptObjPropertyAsync(model.Login.Fido2Key, cipher.Login.Fido2Key, Fido2Key.EncryptableProperties, key);
+                        cipher.Login.Fido2Keys = new List<Fido2Key>();
+                        foreach (var fido2Key in model.Login.Fido2Keys)
+                        {
+                            var fido2KeyDomain = new Fido2Key();
+                            await EncryptObjPropertyAsync(fido2Key, fido2KeyDomain, Fido2Key.EncryptableProperties, key);
+                            cipher.Login.Fido2Keys.Add(fido2KeyDomain);
+                        }
                     }
                     break;
                 case CipherType.SecureNote:
@@ -1180,10 +1172,6 @@ private async Task EncryptCipherDataAsync(Cipher cipher, CipherView model, Symme
                         "LicenseNumber"
                     }, key);
                     break;
-                case CipherType.Fido2Key:
-                    cipher.Fido2Key = new Fido2Key();
-                    await EncryptObjPropertyAsync(model.Fido2Key, cipher.Fido2Key, Fido2Key.EncryptableProperties, key);
-                    break;
                 default:
                     throw new Exception("Unknown cipher type.");
             }
diff --git a/src/Core/Services/CryptoService.cs b/src/Core/Services/CryptoService.cs
index f01d470c678..534db688d88 100644
--- a/src/Core/Services/CryptoService.cs
+++ b/src/Core/Services/CryptoService.cs
@@ -62,6 +62,16 @@ public Task<UserKey> GetUserKeyAsync(string userId = null)
             return _stateService.GetUserKeyAsync(userId);
         }
 
+        public async Task<bool> IsLegacyUserAsync(MasterKey masterKey = null, string userId = null)
+        {
+            masterKey ??= await GetMasterKeyAsync(userId);
+            if (masterKey == null)
+            {
+                return false;
+            }
+            return await ValidateUserKeyAsync(new UserKey(masterKey.Key));
+        }
+
         public async Task<UserKey> GetUserKeyWithLegacySupportAsync(string userId = null)
         {
             var userKey = await GetUserKeyAsync(userId);
@@ -997,6 +1007,31 @@ private async Task<TKey> MakeKeyAsync<TKey>(string password, string salt, KdfCon
             return keyCreator(key);
         }
 
+        private async Task<bool> ValidateUserKeyAsync(UserKey key, string userId = null)
+        {
+            if (key == null)
+            {
+                return false;
+            }
+
+            try
+            {
+                var encPrivateKey = await _stateService.GetPrivateKeyEncryptedAsync(userId);
+                if (encPrivateKey == null)
+                {
+                    return false;
+                }
+
+                var privateKey = await DecryptToBytesAsync(new EncString(encPrivateKey), key);
+                await _cryptoFunctionService.RsaExtractPublicKeyAsync(privateKey);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
         private class EncryptedObject
         {
             public byte[] Iv { get; set; }
@@ -1019,6 +1054,10 @@ private async Task MigrateAutoAndBioKeysIfNeededAsync(string userId = null)
 
             // Decrypt
             var masterKey = new MasterKey(Convert.FromBase64String(oldKey));
+            if (await IsLegacyUserAsync(masterKey, userId))
+            {
+                throw new LegacyUserException();
+            }
             var encryptedUserKey = await _stateService.GetEncKeyEncryptedAsync(userId);
             if (encryptedUserKey == null)
             {
@@ -1058,6 +1097,10 @@ public async Task<UserKey> DecryptAndMigrateOldPinKeyAsync(
                 kdfConfig,
                 oldPinKey
             );
+            if (await IsLegacyUserAsync(masterKey))
+            {
+                throw new LegacyUserException();
+            }
             var encUserKey = await _stateService.GetEncKeyEncryptedAsync();
             var userKey = await DecryptUserKeyWithMasterKeyAsync(
                 masterKey,
diff --git a/src/Core/Services/StateService.cs b/src/Core/Services/StateService.cs
index 5920870c949..443a94b154a 100644
--- a/src/Core/Services/StateService.cs
+++ b/src/Core/Services/StateService.cs
@@ -1538,7 +1538,6 @@ await Task.WhenAll(
                 SetEncryptedPasswordGenerationHistoryAsync(null, userId),
                 SetEncryptedSendsAsync(null, userId),
                 SetSettingsAsync(null, userId),
-                SetApprovePasswordlessLoginsAsync(null, userId),
                 SetEncKeyEncryptedAsync(null, userId),
                 SetKeyEncryptedAsync(null, userId),
                 SetPinProtectedAsync(null, userId));
diff --git a/src/Core/Services/VaultTimeoutService.cs b/src/Core/Services/VaultTimeoutService.cs
index 09b48953aed..51b29ac3760 100644
--- a/src/Core/Services/VaultTimeoutService.cs
+++ b/src/Core/Services/VaultTimeoutService.cs
@@ -2,6 +2,8 @@
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Exceptions;
+using Bit.Core.Models.Domain;
 
 namespace Bit.Core.Services
 {
@@ -67,14 +69,23 @@ public async Task<bool> IsLockedAsync(string userId = null)
 
             if (!await _cryptoService.HasUserKeyAsync(userId))
             {
-                if (!await _cryptoService.HasAutoUnlockKeyAsync(userId))
+                try
                 {
-                    return true;
+                    if (!await _cryptoService.HasAutoUnlockKeyAsync(userId))
+                    {
+                        return true;
+                    }
+                    if (userId != null && await _stateService.GetActiveUserIdAsync() != userId)
+                    {
+                        await _cryptoService.SetUserKeyAsync(await _cryptoService.GetAutoUnlockKeyAsync(userId),
+                            userId);
+                    }
                 }
-                if (userId != null && await _stateService.GetActiveUserIdAsync() != userId)
+                catch (LegacyUserException)
                 {
-                    await _cryptoService.SetUserKeyAsync(await _cryptoService.GetAutoUnlockKeyAsync(userId), userId);
+                    await LogOutAsync(false, userId);
                 }
+
             }
 
             // Check again to verify auto key was set
diff --git a/src/Core/Utilities/CipherTypeExtensions.cs b/src/Core/Utilities/CipherTypeExtensions.cs
deleted file mode 100644
index b306fc4ceea..00000000000
--- a/src/Core/Utilities/CipherTypeExtensions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Bit.Core.Enums;
-
-namespace Bit.Core.Utilities
-{
-    public static class CipherTypeExtensions
-    {
-        public static bool IsEqualToOrCanSignIn(this CipherType type, CipherType type2)
-        {
-            return type == type2
-                   ||
-                   (type == CipherType.Login && type2 == CipherType.Fido2Key);
-        }
-    }
-}
diff --git a/src/iOS.Autofill/Info.plist b/src/iOS.Autofill/Info.plist
index 87228056c2d..d7304f0b656 100644
--- a/src/iOS.Autofill/Info.plist
+++ b/src/iOS.Autofill/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.8.1</string>
+	<string>2023.9.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>
diff --git a/src/iOS.Core/Controllers/BaseLockPasswordViewController.cs b/src/iOS.Core/Controllers/BaseLockPasswordViewController.cs
index 0befe3cf49f..f2fcfc00884 100644
--- a/src/iOS.Core/Controllers/BaseLockPasswordViewController.cs
+++ b/src/iOS.Core/Controllers/BaseLockPasswordViewController.cs
@@ -7,6 +7,7 @@
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
@@ -120,8 +121,7 @@ public override async void ViewDidLoad()
                 _pinEnabled = (_pinStatus == PinLockType.Transient && ephemeralPinSet != null) ||
                     _pinStatus == PinLockType.Persistent;
 
-                _biometricEnabled = await _vaultTimeoutService.IsBiometricLockSetAsync()
-                    && await _biometricService.CanUseBiometricsUnlockAsync();
+                _biometricEnabled = await IsBiometricsEnabledAsync();
                 _hasMasterPassword = await _userVerificationService.HasMasterPasswordAsync();
                 _biometricUnlockOnly = !_hasMasterPassword && _biometricEnabled && !_pinEnabled;
 
@@ -260,99 +260,26 @@ protected async Task CheckPasswordAsync()
                     &&
                     kdfConfig.Memory > Constants.MaximumArgon2IdMemoryBeforeExtensionCrashing
                     &&
-                    !await _platformUtilsService.ShowDialogAsync(AppResources.UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve, AppResources.Warning, AppResources.Continue, AppResources.Cancel))
+                    !await _platformUtilsService.ShowDialogAsync(
+                        AppResources.UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve,
+                        AppResources.Warning, AppResources.Continue, AppResources.Cancel))
                 {
                     return;
                 }
 
                 if (_pinEnabled)
                 {
-                    var failed = true;
-                    try
-                    {
-                        EncString userKeyPin = null;
-                        EncString oldPinProtected = null;
-                        if (_pinStatus == PinLockType.Persistent)
-                        {
-                            userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
-                            var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
-                            oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
-                        }
-                        else if (_pinStatus == PinLockType.Transient)
-                        {
-                            userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
-                            oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
-                        }
-
-                        UserKey userKey;
-                        if (oldPinProtected != null)
-                        {
-                            userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
-                                _pinStatus == PinLockType.Transient,
-                                inputtedValue,
-                                email,
-                                kdfConfig,
-                                oldPinProtected
-                            );
-                        }
-                        else
-                        {
-                            userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
-                                inputtedValue,
-                                email,
-                                kdfConfig,
-                                userKeyPin
-                            );
-                        }
-
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
-                        var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
-                        failed = decryptedPin != inputtedValue;
-                        if (!failed)
-                        {
-                            await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                            await SetKeyAndContinueAsync(userKey);
-                        }
-                    }
-                    catch
-                    {
-                        failed = true;
-                    }
-                    if (failed)
-                    {
-                        await HandleFailedCredentialsAsync();
-                    }
+                    await UnlockWithPinAsync(inputtedValue, email, kdfConfig);
                 }
                 else
                 {
-                    var masterKey = await _cryptoService.MakeMasterKeyAsync(inputtedValue, email, kdfConfig);
-
-                    var storedPasswordHash = await _cryptoService.GetMasterKeyHashAsync();
-                    if (storedPasswordHash == null)
-                    {
-                        var oldKey = await _secureStorageService.GetAsync<string>("oldKey");
-                        if (masterKey.KeyB64 == oldKey)
-                        {
-                            var localPasswordHash = await _cryptoService.HashMasterKeyAsync(inputtedValue, masterKey, HashPurpose.LocalAuthorization);
-                            await _secureStorageService.RemoveAsync("oldKey");
-                            await _cryptoService.SetMasterKeyHashAsync(localPasswordHash);
-                        }
-                    }
-                    var passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(inputtedValue, masterKey);
-                    if (passwordValid)
-                    {
-                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-
-                        var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
-                        await _cryptoService.SetMasterKeyAsync(masterKey);
-                        await SetKeyAndContinueAsync(userKey, true);
-                    }
-                    else
-                    {
-                        await HandleFailedCredentialsAsync();
-                    }
+                    await UnlockWithMasterPasswordAsync(inputtedValue, email, kdfConfig);
                 }
             }
+            catch (LegacyUserException)
+            {
+                await HandleLegacyUserAsync();
+            }
             finally
             {
                 _checkingPassword = false;
@@ -370,20 +297,127 @@ private async Task HandleFailedCredentialsAsync()
             InvalidValue();
         }
 
+        private async Task UnlockWithPinAsync(string inputPin, string email, KdfConfig kdfConfig)
+        {
+            var failed = true;
+            try
+            {
+                EncString userKeyPin = null;
+                EncString oldPinProtected = null;
+                if (_pinStatus == PinLockType.Persistent)
+                {
+                    userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
+                    var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
+                    oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
+                }
+                else if (_pinStatus == PinLockType.Transient)
+                {
+                    userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
+                    oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
+                }
+
+                UserKey userKey;
+                if (oldPinProtected != null)
+                {
+                    userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
+                        _pinStatus == PinLockType.Transient,
+                        inputPin,
+                        email,
+                        kdfConfig,
+                        oldPinProtected
+                    );
+                }
+                else
+                {
+                    userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
+                        inputPin,
+                        email,
+                        kdfConfig,
+                        userKeyPin
+                    );
+                }
+
+                var protectedPin = await _stateService.GetProtectedPinAsync();
+                var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
+                failed = decryptedPin != inputPin;
+                if (!failed)
+                {
+                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+                    await SetKeyAndContinueAsync(userKey);
+                }
+            }
+            catch
+            {
+                failed = true;
+            }
+
+            if (failed)
+            {
+                await HandleFailedCredentialsAsync();
+            }
+        }
+
+        private async Task UnlockWithMasterPasswordAsync(string inputPassword, string email, KdfConfig kdfConfig)
+        {
+            var masterKey = await _cryptoService.MakeMasterKeyAsync(inputPassword, email, kdfConfig);
+            if (await _cryptoService.IsLegacyUserAsync(masterKey))
+            {
+                throw new LegacyUserException();
+            }
+
+            var storedPasswordHash = await _cryptoService.GetMasterKeyHashAsync();
+            if (storedPasswordHash == null)
+            {
+                var oldKey = await _secureStorageService.GetAsync<string>("oldKey");
+                if (masterKey.KeyB64 == oldKey)
+                {
+                    var localPasswordHash =
+                        await _cryptoService.HashMasterKeyAsync(inputPassword, masterKey,
+                            HashPurpose.LocalAuthorization);
+                    await _secureStorageService.RemoveAsync("oldKey");
+                    await _cryptoService.SetMasterKeyHashAsync(localPasswordHash);
+                }
+            }
+
+            var passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(inputPassword, masterKey);
+            if (passwordValid)
+            {
+                await AppHelpers.ResetInvalidUnlockAttemptsAsync();
+
+                var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
+                await _cryptoService.SetMasterKeyAsync(masterKey);
+                await SetKeyAndContinueAsync(userKey, true);
+            }
+            else
+            {
+                await HandleFailedCredentialsAsync();
+            }
+        }
+
         public async Task PromptBiometricAsync()
         {
-            if (!_biometricEnabled || !_biometricIntegrityValid)
+            try
             {
-                return;
+                if (!_biometricEnabled || !_biometricIntegrityValid)
+                {
+                    return;
+                }
+
+                var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
+                    _pinEnabled ? AppResources.PIN : AppResources.MasterPassword,
+                    () => MasterPasswordCell.TextField.BecomeFirstResponder(),
+                    !_pinEnabled && !_hasMasterPassword);
+
+                await _stateService.SetBiometricLockedAsync(!success);
+                if (success)
+                {
+                    var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
+                    await SetKeyAndContinueAsync(userKey);
+                }
             }
-            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                _pinEnabled ? AppResources.PIN : AppResources.MasterPassword,
-                () => MasterPasswordCell.TextField.BecomeFirstResponder());
-            await _stateService.SetBiometricLockedAsync(!success);
-            if (success)
+            catch (LegacyUserException)
             {
-                var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
-                await SetKeyAndContinueAsync(userKey);
+                await HandleLegacyUserAsync();
             }
         }
 
@@ -435,6 +469,29 @@ private async Task EnableBiometricsIfNeeded()
                 await _biometricService.SetupBiometricAsync(BiometricIntegritySourceKey);
             }
         }
+        
+        private async Task<bool> IsBiometricsEnabledAsync()
+        {
+            try
+            {
+                return await _vaultTimeoutService.IsBiometricLockSetAsync() &&
+                                   await _biometricService.CanUseBiometricsUnlockAsync();
+            }
+            catch (LegacyUserException)
+            {
+                await HandleLegacyUserAsync();
+            }
+            return false;
+        }
+
+        private async Task HandleLegacyUserAsync()
+        {
+            // Legacy users must migrate on web vault.
+            await _platformUtilsService.ShowDialogAsync(AppResources.EncryptionKeyMigrationRequiredDescriptionLong,
+                AppResources.AnErrorHasOccurred,
+                AppResources.Ok);
+            await _vaultTimeoutService.LogOutAsync();
+        }
 
         private void InvalidValue()
         {
diff --git a/src/iOS.Extension/Info.plist b/src/iOS.Extension/Info.plist
index be97c71cc67..1ea6cbf9b6d 100644
--- a/src/iOS.Extension/Info.plist
+++ b/src/iOS.Extension/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.8.1</string>
+	<string>2023.9.2</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
diff --git a/src/iOS.ShareExtension/Info.plist b/src/iOS.ShareExtension/Info.plist
index 98e23105eb1..26d2f8abdbb 100644
--- a/src/iOS.ShareExtension/Info.plist
+++ b/src/iOS.ShareExtension/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.8.1</string>
+	<string>2023.9.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>
diff --git a/src/iOS/Info.plist b/src/iOS/Info.plist
index 1776056de02..5575ce83fae 100644
--- a/src/iOS/Info.plist
+++ b/src/iOS/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.8.1</string>
+	<string>2023.9.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleIconName</key>