diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index efe7dae723..bd4dad5d5f 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -227,6 +227,9 @@ module.exports = React.createClass({
                     const teamToken = data.team_token;
                     // Store for use /w welcome pages
                     window.localStorage.setItem('mx_team_token', teamToken);
+                    // Set the team token and view homepage
+                    window.matrixChat._teamToken = teamToken;
+                    window.mxDispatcher.dispatch({action: 'view_home_page'});
 
                     self._rtsClient.getTeam(teamToken).then((team) => {
                         console.log(