diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index a6a95cb0..f7c24211 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -2757,10 +2757,10 @@ $(document).ready(function() {
     function OAuthSuccessCallback(authToken) {
         $.post('save_pms_token', { token: authToken, client_id: $('#pms_client_id').val() }, function() {
             showMsg('<i class="fa fa-check"></i> Saved new Plex.tv token.', false, true, 5000);
+            getServerOptions();
         });
         $("#pms-token-status").html('<i class="fa fa-check"></i>&nbsp; Authentication successful.').fadeIn('fast');
         $("#token_error_bar").hide();
-        getServerOptions(authToken);
     }
     function OAuthErrorCallback() {
         $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i>&nbsp; Error communicating with Plex.tv.').fadeIn('fast');
diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html
index c1e043cc..e67deb49 100644
--- a/data/interfaces/default/welcome.html
+++ b/data/interfaces/default/welcome.html
@@ -541,10 +541,10 @@ $(document).ready(function() {
     function OAuthSuccessCallback(authToken) {
         $.post('save_pms_token', { token: authToken, client_id: $('#pms_client_id').val() }, function () {
             $("#pms_token_validated").val(1);
+            getServerOptions();
         });
         $("#pms-token-status").html('<i class="fa fa-check"></i>&nbsp; Authentication successful.').fadeIn('fast');
         authenticated = true;
-        getServerOptions(authToken);
     }
     function OAuthErrorCallback() {
         $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i>&nbsp; Error communicating with Plex.tv.').fadeIn('fast');
diff --git a/plexpy/plextv.py b/plexpy/plextv.py
index ebfa0bc6..1b596fc7 100644
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -164,7 +164,6 @@ class PlexTV(object):
 
             if not self.token:
                 logger.error("Tautulli PlexTV :: PlexTV called, but no token provided.")
-                return
 
         self.request_handler = http_handler.HTTPHandler(urls=self.urls,
                                                         token=self.token,