diff --git a/src/UI/Form/PasswordTemplate.hbs b/src/UI/Form/PasswordTemplate.hbs
index 619edb3161..3a96cab7f6 100644
--- a/src/UI/Form/PasswordTemplate.hbs
+++ b/src/UI/Form/PasswordTemplate.hbs
@@ -2,7 +2,7 @@
     <label class="col-sm-3 control-label">{{label}}</label>
 
     <div class="col-sm-5">
-        <input type="password" name="fields.{{order}}.value" validation-name="{{name}}" class="form-control"/>
+        <input type="password" name="fields.{{order}}.value" validation-name="{{name}}" autocomplete="new-password" class="form-control"/>
     </div>
     {{> FormHelpPartial}}
 </div>
diff --git a/src/UI/Settings/General/GeneralViewTemplate.hbs b/src/UI/Settings/General/GeneralViewTemplate.hbs
index b22abe9a61..a8493cd8e8 100644
--- a/src/UI/Settings/General/GeneralViewTemplate.hbs
+++ b/src/UI/Settings/General/GeneralViewTemplate.hbs
@@ -131,7 +131,7 @@
                 <label class="col-sm-3 control-label">Username</label>
 
                 <div class="col-sm-4">
-                    <input type="text" placeholder="Username" name="username" class="form-control"/>
+                    <input type="text" placeholder="Username" name="username" spellcheck="false" class="form-control"/>
                 </div>
             </div>
 
@@ -139,7 +139,7 @@
                 <label class="col-sm-3 control-label">Password</label>
 
                 <div class="col-sm-4">
-                    <input type="password" name="password" class="form-control"/>
+                    <input type="password" name="password" autocomplete="new-password" class="form-control"/>
                 </div>
             </div>
         </div>
@@ -162,13 +162,13 @@
             </div>
         </div>
     </fieldset>
-    
+
     <fieldset>
         <legend>Proxy Settings</legend>
-        
+
         <div class="form-group">
             <label class="col-sm-3 control-label">Use Proxy</label>
-            
+
             <div class="col-sm-8">
                 <div class="input-group">
                     <label class="checkbox toggle well">
@@ -237,22 +237,22 @@
                     <input type="password" name="proxyPassword" class="form-control"/>
                 </div>
             </div>
-            
+
             <div class="form-group">
                 <label class="col-sm-3 control-label">Addresses for the proxy to ignore</label>
 
                 <div class="col-sm-1 col-sm-push-4 help-inline">
                     <i class="icon-sonarr-form-info" title="Use ',' as a separator, and '*.' as a wildcard for subdomains"/>
                 </div>
-                
+
                 <div class="col-sm-4 col-sm-pull-1">
                     <input type="text" name="proxyBypassFilter" class="form-control"/>
                 </div>
             </div>
-            
+
             <div class="form-group">
             <label class="col-sm-3 control-label">Bypass Proxy for Local Addresses</label>
-            
+
             <div class="col-sm-8">
                 <div class="input-group">
                     <label class="checkbox toggle well">