diff --git a/dist/bundle.es.js b/dist/bundle.es.js
index 8f87b96..60da20b 100644
--- a/dist/bundle.es.js
+++ b/dist/bundle.es.js
@@ -331,46 +331,43 @@ Lbryio.authenticate = () => {
           return user;
         }
 
-        return lbryRedux.Lbry.status().then(status => {
-          if (Lbryio.overrides.setAuthToken) {
-            return Lbryio.overrides.setAuthToken(status);
-          } // simply call the logic to create a new user, and obtain the auth token
+        return lbryRedux.Lbry.status().then(status => new Promise((res, rej) => {
+          Lbryio.call('user', 'new', {
+            auth_token: '',
+            language: 'en',
+            app_id: status.installation_id
+          }, 'post').then(response => {
+            if (!response.auth_token) {
+              throw new Error('auth_token was not set in the response');
+            }
 
+            const {
+              store
+            } = window;
 
-          return new Promise((res, rej) => {
-            Lbryio.call('user', 'new', {
-              auth_token: '',
-              language: 'en',
-              app_id: status.installation_id
-            }, 'post').then(response => {
-              if (!response.auth_token) {
-                throw new Error('auth_token was not set in the response');
-              }
+            if (Lbryio.overrides.setAuthToken) {
+              Lbryio.overrides.setAuthToken(response.auth_token);
+            }
 
-              const {
-                store
-              } = window;
+            if (store) {
+              store.dispatch({
+                type: GENERATE_AUTH_TOKEN_SUCCESS,
+                data: {
+                  authToken: response.auth_token
+                }
+              });
+            }
 
-              if (store) {
-                store.dispatch({
-                  type: GENERATE_AUTH_TOKEN_SUCCESS,
-                  data: {
-                    authToken: response.auth_token
-                  }
-                });
-              }
+            Lbryio.authToken = response.auth_token;
+            return res(response);
+          }).catch(error => rej(error));
+        })).then(newUser => {
+          if (!newUser) {
+            return Lbryio.getCurrentUser();
+          }
 
-              Lbryio.authToken = response.auth_token;
-              res(response);
-            }).catch(error => rej(error));
-          });
+          return newUser;
         });
-      }).then(user => {
-        if (!user) {
-          return Lbryio.getCurrentUser();
-        }
-
-        return user;
       }).then(resolve, reject);
     });
   }
diff --git a/dist/bundle.js b/dist/bundle.js
index 4ad0136..f27dcb4 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -644,11 +644,6 @@ Lbryio.authenticate = function () {
         }
 
         return lbry_redux__WEBPACK_IMPORTED_MODULE_1__["Lbry"].status().then(function (status) {
-          if (Lbryio.overrides.setAuthToken) {
-            return Lbryio.overrides.setAuthToken(status);
-          } // simply call the logic to create a new user, and obtain the auth token
-
-
           return new Promise(function (res, rej) {
             Lbryio.call('user', 'new', {
               auth_token: '',
@@ -662,6 +657,10 @@ Lbryio.authenticate = function () {
               var _window2 = window,
                   store = _window2.store;
 
+              if (Lbryio.overrides.setAuthToken) {
+                Lbryio.overrides.setAuthToken(response.auth_token);
+              }
+
               if (store) {
                 store.dispatch({
                   type: constants_action_types__WEBPACK_IMPORTED_MODULE_0__["GENERATE_AUTH_TOKEN_SUCCESS"],
@@ -672,18 +671,18 @@ Lbryio.authenticate = function () {
               }
 
               Lbryio.authToken = response.auth_token;
-              res(response);
+              return res(response);
             })["catch"](function (error) {
               return rej(error);
             });
           });
-        });
-      }).then(function (user) {
-        if (!user) {
-          return Lbryio.getCurrentUser();
-        }
+        }).then(function (newUser) {
+          if (!newUser) {
+            return Lbryio.getCurrentUser();
+          }
 
-        return user;
+          return newUser;
+        });
       }).then(resolve, reject);
     });
   }
diff --git a/src/lbryio.js b/src/lbryio.js
index 53faabe..bd44a35 100644
--- a/src/lbryio.js
+++ b/src/lbryio.js
@@ -136,49 +136,48 @@ Lbryio.authenticate = () => {
             return user;
           }
 
-          return Lbry.status().then(status => {
-            if (Lbryio.overrides.setAuthToken) {
-              return Lbryio.overrides.setAuthToken(status);
-            }
+          return Lbry.status()
+            .then(
+              status =>
+                new Promise((res, rej) => {
+                  Lbryio.call(
+                    'user',
+                    'new',
+                    {
+                      auth_token: '',
+                      language: 'en',
+                      app_id: status.installation_id,
+                    },
+                    'post'
+                  )
+                    .then(response => {
+                      if (!response.auth_token) {
+                        throw new Error('auth_token was not set in the response');
+                      }
 
-            // simply call the logic to create a new user, and obtain the auth token
-            return new Promise((res, rej) => {
-              Lbryio.call(
-                'user',
-                'new',
-                {
-                  auth_token: '',
-                  language: 'en',
-                  app_id: status.installation_id,
-                },
-                'post'
-              )
-                .then(response => {
-                  if (!response.auth_token) {
-                    throw new Error('auth_token was not set in the response');
-                  }
+                      const { store } = window;
+                      if (Lbryio.overrides.setAuthToken) {
+                        Lbryio.overrides.setAuthToken(response.auth_token);
+                      }
 
-                  const { store } = window;
-                  if (store) {
-                    store.dispatch({
-                      type: ACTIONS.GENERATE_AUTH_TOKEN_SUCCESS,
-                      data: { authToken: response.auth_token },
-                    });
-                  }
-
-                  Lbryio.authToken = response.auth_token;
-                  res(response);
+                      if (store) {
+                        store.dispatch({
+                          type: ACTIONS.GENERATE_AUTH_TOKEN_SUCCESS,
+                          data: { authToken: response.auth_token },
+                        });
+                      }
+                      Lbryio.authToken = response.auth_token;
+                      return res(response);
+                    })
+                    .catch(error => rej(error));
                 })
-                .catch(error => rej(error));
+            )
+            .then(newUser => {
+              if (!newUser) {
+                return Lbryio.getCurrentUser();
+              }
+              return newUser;
             });
-          });
-        })
-        .then(user => {
-          if (!user) {
-            return Lbryio.getCurrentUser();
-          }
-
-          return user;
         })
         .then(resolve, reject);
     });