diff --git a/templates/channel.jade b/templates/channel.jade
index 6c8a2c6a..3315e9a8 100644
--- a/templates/channel.jade
+++ b/templates/channel.jade
@@ -41,8 +41,7 @@ html(lang="en")
               #chatheader
                 i#userlisttoggle.glyphicon.glyphicon-chevron-down.pull-left.pointer(title="Show/Hide Userlist")
                 span#usercount.pointer Not Connected
-                span#modflair.label.label-default.pull-right.pointer M
-                span#adminflair.label.label-default.pull-right.pointer A
+                span#modflair.label.label-default.pull-right.pointer Name Color
               #userlist
               #messagebuffer.linewrap
               input#chatline.form-control(type="text", maxlength="240", style="display: none")
diff --git a/www/js/ui.js b/www/js/ui.js
index bb80663a..c17fa099 100644
--- a/www/js/ui.js
+++ b/www/js/ui.js
@@ -28,25 +28,21 @@ $("#modflair").click(function () {
     var m = $("#modflair");
     if (m.hasClass("label-success")) {
         USEROPTS.modhat = false;
-        m.removeClass("label-success")
-         .addClass("label-default");
+        m.removeClass("label-success");
+        if (SUPERADMIN) {
+            USEROPTS.adminhat = true;
+            m.addClass("label-danger");
+        } else {
+            m.addClass("label-default");
+        }
+    } else if (m.hasClass("label-danger")) {
+        USEROPTS.adminhat = false;
+        m.removeClass("label-danger")
+            .addClass("label-default");
     } else {
         USEROPTS.modhat = true;
         m.removeClass("label-default")
-         .addClass("label-success");
-    }
-});
-
-$("#adminflair").click(function () {
-    var m = $("#adminflair");
-    if (m.hasClass("label-danger")) {
-        USEROPTS.adminhat = false;
-        m.removeClass("label-danger")
-         .addClass("label-default");
-    } else {
-        USEROPTS.adminhat = true;
-        m.removeClass("label-default")
-         .addClass("label-danger");
+            .addClass("label-success");
     }
 });
 
diff --git a/www/js/util.js b/www/js/util.js
index 2ef63c8b..bbd72ae7 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -930,7 +930,6 @@ function handlePermissionChange() {
     setVisible("#showchansettings", CLIENT.rank >= 2);
     setVisible("#playlistmanagerwrap", CLIENT.rank >= 1);
     setVisible("#modflair", CLIENT.rank >= 2);
-    setVisible("#adminflair", CLIENT.rank >= 255);
     setVisible("#guestlogin", CLIENT.rank < 0);
     setVisible("#chatline", CLIENT.rank >= 0);
     setVisible("#queue", hasPermission("seeplaylist"));