diff --git a/apps/server/AliasVault.Admin/Auth/Pages/LoginWith2fa.razor b/apps/server/AliasVault.Admin/Auth/Pages/LoginWith2fa.razor
index 4c3ccbd26..bf29a6b70 100644
--- a/apps/server/AliasVault.Admin/Auth/Pages/LoginWith2fa.razor
+++ b/apps/server/AliasVault.Admin/Auth/Pages/LoginWith2fa.razor
@@ -18,7 +18,7 @@
         <ValidationSummary class="text-red-600 dark:text-red-400" role="alert"/>
         <div>
             <label for="two-factor-code" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Authenticator code</label>
-            <InputText @bind-Value="Input.TwoFactorCode" id="two-factor-code" class="bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" autocomplete="off"/>
+            <InputText @bind-Value="Input.TwoFactorCode" id="two-factor-code" class="bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" autocomplete="one-time-code"/>
             <ValidationMessage For="() => Input.TwoFactorCode" class="text-red-600 dark:text-red-400 text-sm mt-1"/>
         </div>
         <div class="flex items-start">
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Account/Manage/EnableAuthenticator.razor b/apps/server/AliasVault.Admin/Main/Pages/Account/Manage/EnableAuthenticator.razor
index bb3aa4f74..034b715be 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Account/Manage/EnableAuthenticator.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Account/Manage/EnableAuthenticator.razor
@@ -54,7 +54,7 @@ else
                             <DataAnnotationsValidator/>
                             <div>
                                 <label for="code" class="block mb-2 text-sm font-medium text-gray-700 dark:text-gray-200">Verification Code</label>
-                                <InputText @bind-Value="Input.Code" id="code" class="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white" autocomplete="off" placeholder="Please enter the code."/>
+                                <InputText @bind-Value="Input.Code" id="code" class="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white" autocomplete="one-time-code" placeholder="Please enter the code."/>
                                 <ValidationMessage For="() => Input.Code" class="mt-1 text-sm text-red-600 dark:text-red-400"/>
                             </div>
                             <div>
diff --git a/apps/server/AliasVault.Client/Auth/Pages/Login.razor b/apps/server/AliasVault.Client/Auth/Pages/Login.razor
index 0c050dcd7..f702f7b2d 100644
--- a/apps/server/AliasVault.Client/Auth/Pages/Login.razor
+++ b/apps/server/AliasVault.Client/Auth/Pages/Login.razor
@@ -32,7 +32,7 @@
                             id="two-factor-code"
                             @oninput="OnTwoFactorCodeInput"
                             class="bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                            autocomplete="off"/>
+                            autocomplete="one-time-code"/>
                 <ValidationMessage For="() => _loginModel2Fa.TwoFactorCode" class="text-red-600 dark:text-red-400 text-sm mt-1"/>
             </div>
             <div class="flex items-start">
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Enable2Fa.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Enable2Fa.razor
index 31cac5f8e..772eea9f3 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Enable2Fa.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/Enable2Fa.razor
@@ -40,7 +40,8 @@ else
                     <div>
                         <InputText id="verificationCode" @bind-Value="VerifyModel.Code"
                                    class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-400"
-                                   placeholder="@Localizer["VerificationCodePlaceholder"]"/>
+                                   placeholder="@Localizer["VerificationCodePlaceholder"]"
+                                   autocomplete="one-time-code"/>
                     </div>
                     <button type="submit"
                             class="w-full bg-primary-500 text-white py-2 px-4 rounded-md hover:bg-primary-600 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 transition duration-150 ease-in-out">