Refactored asynchronous calls to remove a race condition on new user login.