diff --git a/notebook/static/auth/js/loginmain.js b/notebook/static/auth/js/loginmain.js
index ab9e51e4f..025112188 100644
--- a/notebook/static/auth/js/loginmain.js
+++ b/notebook/static/auth/js/loginmain.js
@@ -5,9 +5,11 @@ define(['jquery', 'base/js/namespace', 'base/js/page'], function($, IPython, pag
     function login_main() {
       var page_instance = new page.Page('div#header', 'div#site');
       $('button#login_submit').addClass("btn btn-default");
+      $('button#login_new_pass_submit').addClass("btn btn-default");
       page_instance.show();
       $('input#password_input').focus();
-    
+      $('input#token_input').focus();
+
       IPython.page = page_instance;
     }
     return login_main;
diff --git a/notebook/templates/login.html b/notebook/templates/login.html
index 08e5bd1db..f341d9798 100644
--- a/notebook/templates/login.html
+++ b/notebook/templates/login.html
@@ -27,6 +27,7 @@
           {% endif %}
             <form action="{{base_url}}login?next={{next}}" method="post" class="navbar-form pull-left">
               {{ xsrf_form_html() | safe }}
+              <label for="password_input">Password</label>
               <input type="password" name="password" id="password_input" class="form-control">
               <button type="submit" id="login_submit">{% trans %}Log in{% endtrans %}</button>
             </form>
@@ -92,14 +93,16 @@ http://localhost:8888/?token=c8de56fa... :: /Users/you/notebooks
         <form action="{{base_url}}login?next={{next}}" method="post" class="">
                 {{ xsrf_form_html() | safe }}
           <div class="form-group">
-            <input type="password" name="password" id="password_input" class="form-control" placeholder="Token">
+            <label for="token_input">Token</label>
+            <input type="password" name="password" id="token_input" class="form-control" placeholder="Token">
           </div>
           <div class="form-group">
+            <label for="new_password_input">New Password</label>
             <input type="password" name="new_password" id="new_password_input"
             class="form-control" placeholder="New password" required>
           </div>
           <div class="form-group">
-            <button type="submit" id="login_submit">{% trans %}Log in and set new password{% endtrans %}</button>
+            <button type="submit" id="login_new_pass_submit">{% trans %}Log in and set new password{% endtrans %}</button>
           </div>
         </form>
       {% endif %}