diff --git a/src/structures/ClientUser.js b/src/structures/ClientUser.js
index cc19ad58b..ce71d9bcf 100644
--- a/src/structures/ClientUser.js
+++ b/src/structures/ClientUser.js
@@ -88,6 +88,8 @@ class ClientUser extends User {
         this.guildSettings.set(settings.guild_id, new ClientUserGuildSettings(this.client, settings));
       }
     }
+
+    if (data.token) this.client.token = data.token;
   }
 
   /**
diff --git a/src/structures/User.js b/src/structures/User.js
index 814d3a90c..f12d67ffa 100644
--- a/src/structures/User.js
+++ b/src/structures/User.js
@@ -63,8 +63,6 @@ class User extends Base {
      * @type {?Message}
      */
     this.lastMessage = null;
-
-    if (data.token) this.client.token = data.token;
   }
 
   /**