diff --git a/share/jupyterhub/templates/login.html b/share/jupyterhub/templates/login.html
index e3bdfa38..8119b69d 100644
--- a/share/jupyterhub/templates/login.html
+++ b/share/jupyterhub/templates/login.html
@@ -47,6 +47,7 @@
       type="text"
       autocapitalize="off"
       autocorrect="off"
+      autocomplete="username"
       class="form-control"
       name="username"
       val="{{username}}"
@@ -57,6 +58,7 @@
     <input
       type="password"
       class="form-control"
+      autocomplete="current-password"
       name="password"
       id="password_input"
       tabindex="2"