diff --git a/static/js/admin.js b/static/js/admin.js
index 58f2594600..516668eba0 100644
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -71,6 +71,10 @@ function populate_streams (streams_data) {
 }
 
 exports.setup_page = function () {
+    var admin_tab = templates.render('admin_tab');
+    $("#administration").html(admin_tab);
+    $("#administration-status").hide();
+
     // create loading indicators
     util.make_loading_indicator($('#admin_page_users_loading_indicator'));
     util.make_loading_indicator($('#admin_page_bots_loading_indicator'));
diff --git a/templates/zerver/administration.html b/static/templates/admin_tab.handlebars
similarity index 98%
rename from templates/zerver/administration.html
rename to static/templates/admin_tab.handlebars
index db8915e403..35a2746234 100644
--- a/templates/zerver/administration.html
+++ b/static/templates/admin_tab.handlebars
@@ -1,8 +1,6 @@
-{# Administration panel #}
-
 <div class="row-fluid">
   <div class="span12">
-      <div class="administration">
+    <div class="administration">
       <div class="alert" id="administration-status"></div>
       <h1>Administration</h1>
       <h2>Users</h2>
@@ -71,4 +69,3 @@
     </div>
   </div>
 </div>
-
diff --git a/templates/zerver/index.html b/templates/zerver/index.html
index b5a9ab4bd0..ddb78a5f55 100644
--- a/templates/zerver/index.html
+++ b/templates/zerver/index.html
@@ -72,7 +72,6 @@ var page_params = {{ page_params }};
                 {% include "zerver/subscriptions.html" %}
             </div>
             <div class="tab-pane" id="administration">
-                {% include "zerver/administration.html" %}
             </div>
             <div class="tab-pane" id="settings">
                 {% include "zerver/settings.html" %}
diff --git a/zerver/tests/frontend/node/templates.js b/zerver/tests/frontend/node/templates.js
index 1aa1872a0e..cc9b0c6a48 100644
--- a/zerver/tests/frontend/node/templates.js
+++ b/zerver/tests/frontend/node/templates.js
@@ -66,6 +66,15 @@ function render(template_name, args) {
     global.write_test_output("actions_popover_content.handlebars", html);
 }());
 
+(function admin_tab() {
+    var html = render('admin_tab');
+    var admin_features = ["admin_users_table", "admin_bots_table",
+                          "admin_streams_table", "admin_deactivated_users_table"];
+    _.each(admin_features, function (admin_feature) {
+        assert.notEqual($(html).find("#" + admin_feature).length, 0);
+    });
+}());
+
 (function admin_streams_list() {
     var html = '<table>';
     var streams = ['devel', 'trac', 'zulip'];