diff --git a/share/jupyterhub/static/js/token.js b/share/jupyterhub/static/js/token.js
index a0993dd5..ad13ba1b 100644
--- a/share/jupyterhub/static/js/token.js
+++ b/share/jupyterhub/static/js/token.js
@@ -1,26 +1,36 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-require(["jquery", "jhapi", "moment"], function ($, JHAPI, moment) {
-    "use strict";
+require(["jquery", "jhapi", "moment"], function($, JHAPI, moment) {
+  "use strict";
 
-    var base_url = window.jhdata.base_url;
-    var user = window.jhdata.user;
-    var api = new JHAPI(base_url);
+  var base_url = window.jhdata.base_url;
+  var user = window.jhdata.user;
+  var api = new JHAPI(base_url);
 
-    $(".time-col").map(function (i, el) {
-        // convert ISO datestamps to nice momentjs ones
-        el = $(el);
-        let m = moment(new Date(el.text().trim()));
-        el.text(m.isValid() ? m.fromNow() : "Never");
-    });
+  $(".time-col").map(function(i, el) {
+    // convert ISO datestamps to nice momentjs ones
+    el = $(el);
+    let m = moment(new Date(el.text().trim()));
+    el.text(m.isValid() ? m.fromNow() : "Never");
+  });
 
-    $("#request-token").click(function () {
-        api.request_token({
-            success: function (reply) {
-                $("#token-result").text(reply.token);
-                $("#token-area").show();
-            }
-        });
+  $("#request-token-form").submit(function() {
+    var note = $("#token-note").val();
+    if (!note.length) {
+      note = "requested via form page";
+    }
+    api.request_token(
+      user,
+      { note: note },
+      {
+        success: function(reply) {
+          $("#token-result").text(reply.token);
+          $("#token-area").show();
+        },
+      }
+    );
+    return false;
+  });
     });
 });
diff --git a/share/jupyterhub/templates/token.html b/share/jupyterhub/templates/token.html
index db4f2399..395ee301 100644
--- a/share/jupyterhub/templates/token.html
+++ b/share/jupyterhub/templates/token.html
@@ -4,12 +4,25 @@
 
 <div class="container">
   <div class="row">
-    <div class="text-center">
-      <a id="request-token" role="button" class="btn btn-lg btn-jupyter" href="#">
-        Request new API token
-      </a>
-    </div>
+    <form id="request-token-form" class="col-md-offset-3 col-md-6">
+      <div class="text-center">
+        <button type="submit" class="btn btn-lg btn-jupyter">
+          Request new API token
+        </button>
+      </div>
+      <div class="form-group">
+        <label for="token-note">Note</label>
+        <input
+          id="token-note"
+          class="form-control"
+          placeholder="note to identify your new token">
+        <small id="note-note" class="form-text text-muted">
+          This note will help you keep track of what your tokens are for.
+        </small>
+      </div>
+    </form>
   </div>
+
   <div class="row">
     <p>
       <div id="token-area" class="col-md-6 col-md-offset-3" style="display: none;">