diff --git a/src/login.html b/src/login.html
index c70064ed95..0b76ce76eb 100644
--- a/src/login.html
+++ b/src/login.html
@@ -6,14 +6,17 @@
 
             <h1 style="margin-top:1em;text-align: left;">${HeaderPleaseSignIn}</h1>
 
-            <div style="height:0; overflow: hidden;"><input type="text" name="fakeusernameremembered" tabindex="-1" /><input type="password" name="fakepasswordremembered" tabindex="-1" /></div>
+            <div style="height:0; overflow: hidden;"><input type="text" name="fakeusernameremembered"
+                    tabindex="-1" /><input type="password" name="fakepasswordremembered" tabindex="-1" /></div>
 
             <div class="inputContainer">
-                <input is="emby-input" type="text" id="txtManualName" required="required" label="${LabelUser}" />
+                <input is="emby-input" type="text" id="txtManualName" required="required" label="${LabelUser}"
+                    autocomplete="username" />
             </div>
 
             <div class="inputContainer">
-                <input is="emby-input" id="txtManualPassword" type="password" label="${LabelPassword}" />
+                <input is="emby-input" id="txtManualPassword" type="password" label="${LabelPassword}"
+                    autocomplete="current-password" />
             </div>
 
             <label class="checkboxContainer">