diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts
index 666044bd0..a65bc96e1 100644
--- a/src/core/siteplugins/providers/helper.ts
+++ b/src/core/siteplugins/providers/helper.ts
@@ -97,14 +97,13 @@ export class CoreSitePluginsHelperProvider {
         this.logger = logger.getInstance('CoreSitePluginsHelperProvider');
 
         // Fetch the plugins on login.
-        eventsProvider.on(CoreEventsProvider.LOGIN, () => {
-            const siteId = this.sitesProvider.getCurrentSiteId();
-            this.fetchSitePlugins(siteId).then((plugins) => {
+        eventsProvider.on(CoreEventsProvider.LOGIN, (data) => {
+            this.fetchSitePlugins(data.siteId).then((plugins) => {
                 // Plugins fetched, check that site hasn't changed.
-                if (siteId == this.sitesProvider.getCurrentSiteId() && plugins.length) {
+                if (data.siteId == this.sitesProvider.getCurrentSiteId() && plugins.length) {
                     // Site is still the same. Load the plugins and trigger the event.
                     this.loadSitePlugins(plugins).then(() => {
-                        eventsProvider.trigger(CoreEventsProvider.SITE_PLUGINS_LOADED, {}, siteId);
+                        eventsProvider.trigger(CoreEventsProvider.SITE_PLUGINS_LOADED, {}, data.siteId);
                     });
 
                 }
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index 0d6a63aac..d1abf0bc9 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -1062,7 +1062,9 @@ export class CoreSitesProvider {
     updateSiteToken(siteUrl: string, username: string, token: string, privateToken: string = ''): Promise<any> {
         const siteId = this.createSiteID(siteUrl, username);
 
-        return this.updateSiteTokenBySiteId(siteId, token, privateToken);
+        return this.updateSiteTokenBySiteId(siteId, token, privateToken).then(() => {
+            return this.login(siteId);
+        });
     }
 
     /**