diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 4687afbee1..8cd2bf8a71 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -232,9 +232,15 @@ export default React.createClass({
                 break;
 
             case PageTypes.HomePage:
+                // If team server config is present, pass the teamServerURL. props.teamToken
+                // must also be set for the team page to be displayed, otherwise the
+                // welcomePageUrl is used (which might be undefined).
+                const teamServerUrl = this.props.config.teamServerConfig ?
+                    this.props.config.teamServerConfig.teamServerURL : null;
+
                 page_element = <HomePage
                     collapsedRhs={this.props.collapse_rhs}
-                    teamServerUrl={this.props.config.teamServerConfig.teamServerURL}
+                    teamServerUrl={teamServerUrl}
                     teamToken={this.props.teamToken}
                     homePageUrl={this.props.config.welcomePageUrl}
                 />;
diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index c371fdd35a..86b5fccbc2 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -53,9 +53,6 @@ export default React.createClass({
             doingUIAuth: false,
             // Indicate error with auth
             authError: '',
-
-            // Indicate success of setting mxid
-            success: false,
         };
     },
 
@@ -98,10 +95,6 @@ export default React.createClass({
         });
     },
 
-    onSuccessContinue: function() {
-        this.props.onFinished(true, this._registeredCreds);
-    },
-
     _doUsernameCheck: function() {
         // Check if username is available
         return this._matrixClient.isUsernameAvailable(this.state.username).then(
@@ -169,7 +162,7 @@ export default React.createClass({
         // XXX Implement RTS /register here
         const teamToken = null;
 
-        this._registeredCreds = {
+        this.props.onFinished(true, {
             userId: response.user_id,
             deviceId: response.device_id,
             homeserverUrl: this._matrixClient.getHomeserverUrl(),
@@ -177,11 +170,6 @@ export default React.createClass({
             accessToken: response.access_token,
             password: this._generatedPassword,
             teamToken: teamToken,
-        };
-
-        // Before continuing, show a warm-fuzzy success and only submit onSuccessContinue
-        this.setState({
-            success: true,
         });
     },
 
@@ -231,31 +219,6 @@ export default React.createClass({
             !this.state.usernameError &&
             !this.state.usernameBusy;
 
-        if (this.state.success) {
-            // XXX BaseDialog needs an onFinished
-            return (
-                <BaseDialog className="mx_SetMxIdDialog"
-                    title="You have successfully picked a username!"
-                >
-                    <div className="mx_Dialog_content">
-                        <p>
-                            You have successfully
-                            picked <b>{ this.state.username }</b> as your
-                            username and you now have access to the full
-                            set of features on Riot.
-                        </p>
-                    </div>
-                    <div className="mx_Dialog_buttons">
-                        <input className="mx_Dialog_primary"
-                            type="submit"
-                            value="Continue"
-                            onClick={this.onSuccessContinue}
-                        />
-                    </div>
-                </BaseDialog>
-            );
-        }
-
         return (
             <BaseDialog className="mx_SetMxIdDialog"
                 onFinished={this.props.onFinished}