diff --git a/src/client/Client.js b/src/client/Client.js
index 0117b339c..b2ed42f1e 100644
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -20,7 +20,7 @@ class Client extends EventEmitter {
   /**
    * @param {ClientOptions} [options] Options for the client
    */
-  constructor(options) {
+  constructor(options = {}) {
     super();
 
     // Obtain shard details from environment
diff --git a/src/client/rest/RESTMethods.js b/src/client/rest/RESTMethods.js
index 82822635e..fed7ab7fd 100644
--- a/src/client/rest/RESTMethods.js
+++ b/src/client/rest/RESTMethods.js
@@ -15,6 +15,7 @@ class RESTMethods {
   }
 
   loginToken(token) {
+    token = token.replace('Bot ', '');
     return new Promise((resolve, reject) => {
       this.rest.client.manager.connectToWebSocket(token, resolve, reject);
     });
@@ -27,7 +28,7 @@ class RESTMethods {
       this.rest.client.password = password;
       this.rest.makeRequest('post', Constants.Endpoints.login, false, { email, password })
         .then(data => {
-          this.rest.client.manager.connectToWebSocket(data.token, resolve, reject);
+          resolve(this.loginToken(data.token));
         })
         .catch(reject);
     });