diff --git a/server/handlers/list_settings.js b/server/handlers/list_settings.js
index c242884f..337ba7d3 100644
--- a/server/handlers/list_settings.js
+++ b/server/handlers/list_settings.js
@@ -213,7 +213,7 @@ function conf_function(params, coll, guid, offline, socket) {
                         adminpass:hash,
                         desc: description,
                     };
-                    if(params.hasOwnProperty("toggleChat")) {
+                    if(params.hasOwnProperty("toggleChat") && docs[0].adminpass != "" && docs[0].adminpass != undefined && docs[0].adminpass == hash) {
                         obj.toggleChat = params.toggleChat;
                     }
                     if(params.userpass_changed) {
diff --git a/server/public/assets/js/admin.js b/server/public/assets/js/admin.js
index fc311188..67078217 100755
--- a/server/public/assets/js/admin.js
+++ b/server/public/assets/js/admin.js
@@ -42,6 +42,7 @@ var Admin = {
         document.getElementById("password").value = "";
         document.getElementById("password").setAttribute("placeholder", "Change admin password");
         Helper.removeClass(".user-password-li", "hide");
+        Helper.removeClass(".chat-toggle-li", "hide");
         Helper.removeClass(".delete-all", "hide");
         if(document.getElementsByClassName("password_protected")[0].checked) {
             Helper.removeClass(".change_user_pass", "hide");
@@ -123,6 +124,7 @@ var Admin = {
 
 
         Helper.addClass(".user-password-li", "hide");
+        Helper.addClass(".chat-toggle-li", "hide");
         Helper.addClass(".delete-all", "hide");
 
         if(document.getElementsByClassName("password_protected")[0].checked) {