diff --git a/BTCPayServer/Services/Mails/EmailSettings.cs b/BTCPayServer/Services/Mails/EmailSettings.cs
index 890c6428f..07d77aef0 100644
--- a/BTCPayServer/Services/Mails/EmailSettings.cs
+++ b/BTCPayServer/Services/Mails/EmailSettings.cs
@@ -24,7 +24,7 @@ namespace BTCPayServer.Services.Mails
         {
             get; set;
         }
-        [DataType(DataType.Password)]
+        
         public string Password
         {
             get; set;
diff --git a/BTCPayServer/Views/Shared/EmailsBody.cshtml b/BTCPayServer/Views/Shared/EmailsBody.cshtml
index 142f6a124..56dd5ceb4 100644
--- a/BTCPayServer/Views/Shared/EmailsBody.cshtml
+++ b/BTCPayServer/Views/Shared/EmailsBody.cshtml
@@ -10,7 +10,7 @@
 </div>
 <div class="row">
     <div class="col-md-6">
-        <form method="post">
+        <form method="post" autocomplete="off">
             <div class="form-group">
                 <label asp-for="Settings.Server"></label>
                 <input asp-for="Settings.Server" class="form-control" />