diff --git a/share/jupyter/hub/static/js/admin.js b/share/jupyter/hub/static/js/admin.js
index 78ac8ef2..5ff1d978 100644
--- a/share/jupyter/hub/static/js/admin.js
+++ b/share/jupyter/hub/static/js/admin.js
@@ -42,6 +42,9 @@ require(["jquery", "bootstrap", "moment", "jhapi", "utils"], function ($, bs, mo
     $("th").map(function (i, th) {
         th = $(th);
         var col = th.data('sort');
+        if (!col || col.length == 0) {
+            return;
+        }
         var order = th.find('i').hasClass('fa-sort-desc') ? 'asc':'desc';
         th.find('a').click(
             function () {
diff --git a/share/jupyter/hub/templates/admin.html b/share/jupyter/hub/templates/admin.html
index 5fdd50ea..7e072f01 100644
--- a/share/jupyter/hub/templates/admin.html
+++ b/share/jupyter/hub/templates/admin.html
@@ -1,15 +1,17 @@
 {% extends "page.html" %}
 
-{% macro th(key, label, order, colspan) %}
+{% macro th(label, key='', colspan=1) %}
 <th data-sort="{{key}}" colspan="{{colspan}}">{{label}}
-  <a href="#"><i class="fa {% if order == 'asc' -%}
+  {% if key %}
+  <a href="#"><i class="fa {% if sort.get(key) == 'asc' -%}
                                fa-sort-asc
-                           {%- elif order == 'desc' -%}
+                           {%- elif sort.get(key) == 'desc' -%}
                                fa-sort-desc
                            {%- else -%}
                                fa-sort
                            {%- endif %} sort-icon">
   </i></a>
+  {% endif %}
 </th>
 {% endmacro %}
 
@@ -19,10 +21,12 @@
   <table class="table table-striped">
     <thead>
       <tr>
-        {{ th('name', "User (%i)" % users.count(), sort.get('name'), 1) }}
-        {{ th('admin', "Admin", sort.get('admin'), 1) }}
-        {{ th('last_activity', "Last Seen", sort.get('last_activity'), 1) }}
-        {{ th('running', "Running (%i)" % running.count(), sort.get('running'), 2) }}
+        {% block thead %}
+        {{ th("User (%i)" % users.count(), 'name') }}
+        {{ th("Admin", 'admin') }}
+        {{ th("Last Seen", 'last_activity') }}
+        {{ th("Running (%i)" % running.count(), 'running', colspan=2) }}
+        {% endblock thead %}
       </tr>
     </thead>
     <tbody>
@@ -33,6 +37,7 @@
       </tr>
   {% for u in users %}
     <tr class="user-row" data-user="{{u.name}}" data-admin="{{u.admin}}">
+      {% block user_row scoped %}
       <td class="name-col col-sm-2">{{u.name}}</td>
       <td class="admin-col col-sm-2">{% if u.admin %}admin{% endif %}</td>
       <td class="time-col col-sm-3">{{u.last_activity.isoformat() + 'Z'}}</td>
@@ -49,6 +54,7 @@
         <span class="delete-user btn btn-xs btn-danger">delete</span>
         {% endif %}
       </td>
+      {% endblock user_row %}
     </tr>
   {% endfor %}
   </tbody>