diff --git a/src/Client.js b/src/Client.js
index eda1a17..0bdbec9 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -121,18 +121,22 @@ class Client extends EventEmitter {
      */
     userset(name, admin) {
         if (name.length > 40 && !admin) return;
-        if (!this.quotas.userset.attempt()) return;
+        if (this.quotas.userset) {
+            if (!this.quotas.userset.attempt()) return;
+        }
         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);
-                
-                this.server.rooms.forEach((room) => {
-                    room.updateParticipant(this.user._id, {
-                        name: name
+            if (!this.user.hasFlag('freeze_name', true)) {
+                Database.getUserData(this, this.server).then((usr) => {
+                    Database.updateUser(this.user._id, this.user);
+                    
+                    this.server.rooms.forEach((room) => {
+                        room.updateParticipant(this.user._id, {
+                            name: name
+                        });
                     });
                 });
-            });
+            }
         }
     }