diff --git a/lib/web/webserver.js b/lib/web/webserver.js
index d0b8273b..0abb3191 100644
--- a/lib/web/webserver.js
+++ b/lib/web/webserver.js
@@ -166,7 +166,7 @@ function handleIndex(req, res) {
     sendJade(res, "index", {
         loggedIn: loginName !== false,
         loginName: loginName,
-        channels: Server.getServer().packChannelList(true)
+        channels: channels
     });
 }
 
diff --git a/www/js/acp.js b/www/js/acp.js
index 54f66082..f2ef37c8 100644
--- a/www/js/acp.js
+++ b/www/js/acp.js
@@ -369,6 +369,7 @@ socket.on("acp-list-activechannels", function (channels) {
         return a.usercount > b.usercount ? -1 : 1;
     });
 
+    var count = 0;
     channels.forEach(function (c) {
         var tr = $("<tr/>").appendTo(tbl);
         var name = $("<td/>").appendTo(tr);
@@ -376,6 +377,7 @@ socket.on("acp-list-activechannels", function (channels) {
             .text(c.pagetitle + " (/r/" + c.name + ")")
             .appendTo(name);
         var usercount = $("<td/>").text(c.usercount).appendTo(tr);
+        count += c.usercount;
         var nowplaying = $("<td/>").text(c.mediatitle).appendTo(tr);
         var registered = $("<td/>").text(c.registered).appendTo(tr);
         var public = $("<td/>").text(c.public).appendTo(tr);
@@ -390,6 +392,14 @@ socket.on("acp-list-activechannels", function (channels) {
                 }
             });
     });
+
+    var total = $("<tr/>").appendTo(tbl);
+    $("<td/>").html("<strong>Total</strong>").appendTo(total);
+    $("<td/>").html("<strong>" + count + "</strong>").appendTo(total);
+    $("<td/>").appendTo(total);
+    $("<td/>").appendTo(total);
+    $("<td/>").appendTo(total);
+    $("<td/>").appendTo(total);
 });
 
 $("#acp-lchannels-refresh").click(function () {