diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index b285bdc782..dda974e41c 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -459,8 +459,18 @@ const LoggedInView = React.createClass({
 
             case PageTypes.HomePage:
                 {
+                    const pagesConfig = this.props.config.pages;
+                    let pageUrl;
+                    if (pagesConfig) {
+                        pageUrl = pagesConfig.homeUrl;
+                    } else {
+                        // This is a deprecated config option for the home page
+                        // (despite the name, given we also now have a welcome
+                        // page, which is not the same).
+                        pageUrl = this.props.config.welcomePageUrl;
+                    }
                     pageElement = <EmbeddedPage className="mx_HomePage"
-                        url={this.props.config.welcomePageUrl || 'home.html'}
+                        url={pageUrl}
                         scrollbar={true}
                     />;
                 }
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 162e549724..0edbd192ea 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -25,12 +25,15 @@ export default class Welcome extends React.PureComponent {
         const AuthBody = sdk.getComponent("auth.AuthBody");
         const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
 
+        const pagesConfig = SdkConfig.get().pages;
+        const pageUrl = pagesConfig ? pagesConfig.welcomeUrl : 'welcome.html';
+
         return (
             <AuthPage>
                 <AuthHeader />
                 <AuthBody>
                     <EmbeddedPage className="mx_WelcomePage"
-                        url={SdkConfig.get().welcomePageUrl || 'home.html'}
+                        url={pageUrl}
                     />
                 </AuthBody>
             </AuthPage>