diff --git a/src/App/Pages/Vault/VaultAddSitePage.cs b/src/App/Pages/Vault/VaultAddSitePage.cs
index 4cf67476d..bbd27a371 100644
--- a/src/App/Pages/Vault/VaultAddSitePage.cs
+++ b/src/App/Pages/Vault/VaultAddSitePage.cs
@@ -45,6 +45,8 @@ namespace Bit.App.Pages
                 useButton: true);
             PasswordCell.Button.Image = "eye";
             PasswordCell.Button.Clicked += PasswordButton_Clicked;
+            PasswordCell.Entry.DisableAutocapitalize = true;
+            PasswordCell.Entry.Autocorrect = false;
 
             var usernameCell = new FormEntryCell(AppResources.Username, nextElement: PasswordCell.Entry);
             usernameCell.Entry.DisableAutocapitalize = true;
diff --git a/src/App/Pages/Vault/VaultEditSitePage.cs b/src/App/Pages/Vault/VaultEditSitePage.cs
index 121e80147..56bf8a1cd 100644
--- a/src/App/Pages/Vault/VaultEditSitePage.cs
+++ b/src/App/Pages/Vault/VaultEditSitePage.cs
@@ -51,6 +51,8 @@ namespace Bit.App.Pages
             PasswordCell.Entry.Text = site.Password?.Decrypt();
             PasswordCell.Button.Image = "eye";
             PasswordCell.Button.Clicked += PasswordButton_Clicked;
+            PasswordCell.Entry.DisableAutocapitalize = true;
+            PasswordCell.Entry.Autocorrect = false;
 
             var usernameCell = new FormEntryCell(AppResources.Username, nextElement: PasswordCell.Entry);
             usernameCell.Entry.Text = site.Username?.Decrypt();