diff --git a/src/Client.js b/src/Client.js
index bc89c71..eda1a17 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -122,8 +122,8 @@ class Client extends EventEmitter {
     userset(name, admin) {
         if (name.length > 40 && !admin) return;
         if (!this.quotas.userset.attempt()) return;
-        if (!this.user.hasFlag('freeze_name', true)) {
-        this.user.name = name;
+        if (!this.user.hasFlag('freeze_name', true) || admin) {
+            this.user.name = name;
             Database.getUserData(this, this.server).then((usr) => {
                 Database.updateUser(this.user._id, this.user);
                 
diff --git a/src/Message.js b/src/Message.js
index bf34b9b..8c1fd23 100644
--- a/src/Message.js
+++ b/src/Message.js
@@ -247,7 +247,6 @@ module.exports = (cl) => {
     });
 
     cl.on("admin message", msg => {
-        console.log(msg);
         // if (!(cl.channel && cl.participantId)) return;
         if (!msg.hasOwnProperty('password') || !msg.hasOwnProperty('msg')) return;
         if (typeof msg.msg != 'object') return;