diff --git a/index.js b/index.js
index 6129ada..938a2f0 100644
--- a/index.js
+++ b/index.js
@@ -66,7 +66,7 @@ module.exports = global.SC = {
     return stream(trackPath, secretToken);
   },
 
-  connectCallback () {
-    callback.notifyDialog(this.location);
+  connectCallback (location) {
+    callback.notifyDialog(location || window.location);
   }
 };
diff --git a/src/connect.js b/src/connect.js
index cd797b5..0f65286 100644
--- a/src/connect.js
+++ b/src/connect.js
@@ -14,8 +14,9 @@ const setOauthToken = (options) => {
 
 module.exports = function (options = {}) {
   // resolve immediately when oauth_token is set
-  const oauth_token = config.get('oauth_token');
+  const oauth_token = options.oauth_token || config.get('oauth_token');
   if (oauth_token) {
+    setOauthToken(options);
     return new Promise((resolve) => { resolve({oauth_token}); });
   }
   // set up the options for the dialog