diff --git a/share/jupyter/hub/static/js/admin.js b/share/jupyter/hub/static/js/admin.js
index d50edb08..78ac8ef2 100644
--- a/share/jupyter/hub/static/js/admin.js
+++ b/share/jupyter/hub/static/js/admin.js
@@ -63,7 +63,9 @@ require(["jquery", "bootstrap", "moment", "jhapi", "utils"], function ($, bs, mo
         el.text("stopping...");
         api.stop_server(user, {
             success: function () {
-                window.location.reload();
+                el.text('stop server').addClass('hidden');
+                row.find('.access-server').addClass('hidden');
+                row.find('.start-server').removeClass('hidden');
             }
         });
     });
@@ -92,7 +94,9 @@ require(["jquery", "bootstrap", "moment", "jhapi", "utils"], function ($, bs, mo
         el.text("starting...");
         api.start_server(user, {
             success: function () {
-                window.location.reload();
+                el.text('start server').addClass('hidden');
+                row.find('.stop-server').removeClass('hidden');
+                row.find('.access-server').removeClass('hidden');
             }
         });
     });
diff --git a/share/jupyter/hub/static/less/page.less b/share/jupyter/hub/static/less/page.less
index b8ac3fa7..76078150 100644
--- a/share/jupyter/hub/static/less/page.less
+++ b/share/jupyter/hub/static/less/page.less
@@ -6,3 +6,7 @@
 div#header {
   border-bottom: 1px solid #ccc;
 }
+
+.hidden {
+  display: none;
+}
\ No newline at end of file
diff --git a/share/jupyter/hub/templates/admin.html b/share/jupyter/hub/templates/admin.html
index 13a8e398..5fdd50ea 100644
--- a/share/jupyter/hub/templates/admin.html
+++ b/share/jupyter/hub/templates/admin.html
@@ -37,14 +37,11 @@
       <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>
       <td class="server-col col-sm-3 text-center">
-      {% if u.server %}
-        <span class="stop-server btn btn-xs btn-danger">stop server</span>
+        <span class="stop-server btn btn-xs btn-danger {% if not u.server %}hidden{% endif %}">stop server</span>
         {% if admin_access %}
-        <span class="access-server btn btn-xs btn-success">access server</span>
+        <span class="access-server btn btn-xs btn-success {% if not u.server %}hidden{% endif %}">access server</span>
         {% endif %}
-      {% else %}
-        <span class="start-server btn btn-xs btn-success">start server</span>
-      {% endif %}
+        <span class="start-server btn btn-xs btn-success {% if u.server %}hidden{% endif %}">start server</span>
       </td>
       <td class="edit-col col-sm-2">
         <span class="edit-user btn btn-xs btn-primary">edit</span>