diff --git a/channel.js b/channel.js
index e257abe9..54547ef4 100644
--- a/channel.js
+++ b/channel.js
@@ -177,10 +177,10 @@ Channel.prototype.saveDump = function() {
 
 // Save channel dumps every 5 minutes, in case of crash
 function incrementalDump(chan) {
-    if(chan && chan.users.length > 0) {
+    if(chan && chan.users && chan.users.length > 0) {
         chan.saveDump();
+        setTimeout(function() { incrementalDump(chan); }, 300000);
     }
-    setTimeout(function() { incrementalDump(chan); }, 300000);
 }
 
 Channel.prototype.tryRegister = function(user) {
diff --git a/server.js b/server.js
index 577bced1..561f66f7 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.5.3";
+const VERSION = "1.5.4";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
@@ -107,6 +107,7 @@ exports.io.sockets.on("connection", function(socket) {
     Logger.syslog.log("Accepted connection from /" + user.ip);
 });
 
+
 process.on("uncaughtException", function(err) {
     Logger.errlog.log("[SEVERE] Uncaught Exception: " + err);
 });
diff --git a/www/acp.html b/www/acp.html
index 36fb67d3..a0dbff79 100644
--- a/www/acp.html
+++ b/www/acp.html
@@ -76,6 +76,20 @@
                 <pre id="log"></pre>
             </div>
         </div>
+        <div class="row">
+            <div class="span8">
+                <h3>Global Bans</h3>
+                <table id="banlist" class="table table-striped table-bordered">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th>IP</th>
+                            <th>Reason</th>
+                        </tr>
+                    </thead>
+                </table>
+            </div>
+        </div>
     </div> <!-- /container -->
     <div class="push"></div>
     <div id="sitefooter">
@@ -113,6 +127,7 @@
                     createCookie("sync_uname", uname, 7);
                     createCookie("sync_session", session, 7);
                     p = "name=" + uname + "&session=" + session;
+                    loadBanlist();
                 }
             });
         }
@@ -128,6 +143,7 @@
                     createCookie("sync_uname", uname, 7);
                     createCookie("sync_session", session, 7);
                     p = "name=" + uname + "&session=" + session;
+                    loadBanlist();
                 }
             });
         });
@@ -155,6 +171,64 @@
                 getChanlog();
             }
         });
+        
+        function loadBanlist() {
+            $.getJSON(IO_URL+"/api/json/globalbans?action=list&"+p+"&callback=?", function(data) {
+                handleBanlist(data);
+            });
+        }
+        function handleBanlist(data) {
+            var tbl = $("#banlist");
+            if(tbl.children().length > 1) {
+                $(tbl.children()[1]).remove();
+            }
+            for(var ip in data) {
+                var tr = $("<tr/>").appendTo($("#banlist"));
+                var btntd = $("<td/>").appendTo(tr);
+                var remove = $("<button/>").addClass("btn btn-danger")
+                    .appendTo(btntd);
+                $("<i/>").addClass("icon-minus").appendTo(remove);
+                remove.click(function(ip) { return function() {
+                    var b = "ip=" + ip;
+                    $.getJSON(IO_URL+"/api/json/globalbans?action=remove&"+b+"&"+p+"&callback=?", function(data) {
+                        if(data.error) {
+                            alert(data.error);
+                        }
+                        else if(!data.success) {
+                            alert("Remove ban failed");
+                        }
+                        loadBanlist();
+                    });
+                } }(ip));
+                var iptd = $("<td/>").appendTo(tr);
+                $("<code/>").text(ip).appendTo(iptd);
+                var reason  = $("<td/>").appendTo(tr);
+                $("<code/>").text(data[ip]).appendTo(reason);
+            }
+            // Add new
+            var tr = $("<tr/>").appendTo($("#banlist"));
+            var add = $("<button/>").addClass("btn btn-success")
+                .appendTo($("<td/>").appendTo(tr));
+            $("<i/>").addClass("icon-plus").appendTo(add);
+            var ip = $("<input/>").attr("type", "text")
+                .appendTo($("<td/>").appendTo(tr));
+            var reason = $("<input/>").attr("type", "text")
+                .appendTo($("<td/>").appendTo(tr));
+
+            add.click(function() {
+                var b = "ip=" + ip.val() + "&reason=" + reason.val();
+                $.getJSON(IO_URL+"/api/json/globalbans?action=add&"+b+"&"+p+"&callback=?", function(data) {
+                    if(data.error) {
+                        alert(data.error);
+                    }
+                    else if(!data.success) {
+                        alert("Add ban failed");
+                    }
+                    loadBanlist();
+                });
+            });
+        }
+
         function createCookie(name,value,days) {
             if (days) {
                 var date = new Date();