diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index a5f62089d6..c4eebc48a1 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -15,14 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_Login_box {
-    width: 300px;
-    min-height: 450px;
-    padding-top: 50px;
-    padding-bottom: 50px;
-    margin: auto;
-}
-
 .mx_Login_support {
     text-align: center;
     font-size: 13px;
diff --git a/res/css/views/auth/_AuthPage.scss b/res/css/views/auth/_AuthPage.scss
index d87a906275..6916f1d92a 100644
--- a/res/css/views/auth/_AuthPage.scss
+++ b/res/css/views/auth/_AuthPage.scss
@@ -30,3 +30,11 @@ limitations under the License.
   margin-top: 32px;
   margin-bottom: 20px;
 }
+
+.mx_AuthPage_modal {
+  width: 300px;
+  min-height: 450px;
+  padding-top: 50px;
+  padding-bottom: 50px;
+  margin: auto;
+}
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 7c763b0c77..ab0f660be0 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -281,10 +281,8 @@ module.exports = React.createClass({
 
         return (
             <AuthPage>
-                <div className="mx_Login_box">
-                    <AuthHeader />
-                    { resetPasswordJsx }
-                </div>
+                <AuthHeader />
+                { resetPasswordJsx }
             </AuthPage>
         );
     },
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 069e3aebb6..c64223ba48 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -559,20 +559,18 @@ module.exports = React.createClass({
 
         return (
             <AuthPage>
-                <div className="mx_Login_box">
-                    <AuthHeader />
-                    <div>
-                        { header }
-                        { errorTextSection }
-                        { this.componentForStep(this.state.currentFlow) }
-                        { serverConfig }
-                        <a className="mx_Login_create" onClick={this.onRegisterClick} href="#">
-                            { _t('Create an account') }
-                        </a>
-                        { loginAsGuestJsx }
-                        <LanguageSelector />
-                        <AuthFooter />
-                    </div>
+                <AuthHeader />
+                <div>
+                    { header }
+                    { errorTextSection }
+                    { this.componentForStep(this.state.currentFlow) }
+                    { serverConfig }
+                    <a className="mx_Login_create" onClick={this.onRegisterClick} href="#">
+                        { _t('Create an account') }
+                    </a>
+                    { loginAsGuestJsx }
+                    <LanguageSelector />
+                    <AuthFooter />
                 </div>
             </AuthPage>
         );
diff --git a/src/components/structures/auth/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
index 78622695cf..fff326f6ac 100644
--- a/src/components/structures/auth/PostRegistration.js
+++ b/src/components/structures/auth/PostRegistration.js
@@ -64,17 +64,15 @@ module.exports = React.createClass({
         const AuthHeader = sdk.getComponent('auth.AuthHeader');
         return (
             <AuthPage>
-                <div className="mx_Login_box">
-                    <AuthHeader />
-                    <div className="mx_Login_profile">
-                        { _t('Set a display name:') }
-                        <ChangeDisplayName />
-                        { _t('Upload an avatar:') }
-                        <ChangeAvatar
-                            initialAvatarUrl={this.state.avatarUrl} />
-                        <button onClick={this.props.onComplete}>{ _t('Continue') }</button>
-                        { this.state.errorString }
-                    </div>
+                <AuthHeader />
+                <div className="mx_Login_profile">
+                    { _t('Set a display name:') }
+                    <ChangeDisplayName />
+                    { _t('Upload an avatar:') }
+                    <ChangeAvatar
+                        initialAvatarUrl={this.state.avatarUrl} />
+                    <button onClick={this.props.onComplete}>{ _t('Continue') }</button>
+                    { this.state.errorString }
                 </div>
             </AuthPage>
         );
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index bd5a3a3fda..39f7964281 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -475,20 +475,18 @@ module.exports = React.createClass({
 
         return (
             <AuthPage>
-                <div className="mx_Login_box">
-                    <AuthHeader
-                        icon={this.state.teamSelected ?
-                            this.props.teamServerConfig.teamServerURL + "/static/common/" +
-                            this.state.teamSelected.domain + "/icon.png" :
-                            null}
-                    />
-                    { header }
-                    { registerBody }
-                    { signIn }
-                    { errorText }
-                    <LanguageSelector />
-                    <AuthFooter />
-                </div>
+                <AuthHeader
+                    icon={this.state.teamSelected ?
+                        this.props.teamServerConfig.teamServerURL + "/static/common/" +
+                        this.state.teamSelected.domain + "/icon.png" :
+                        null}
+                />
+                { header }
+                { registerBody }
+                { signIn }
+                { errorText }
+                <LanguageSelector />
+                <AuthFooter />
             </AuthPage>
         );
     },
diff --git a/src/components/views/auth/AuthPage.js b/src/components/views/auth/AuthPage.js
index 09540885c6..d5f82f7264 100644
--- a/src/components/views/auth/AuthPage.js
+++ b/src/components/views/auth/AuthPage.js
@@ -25,7 +25,9 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_AuthPage">
-                { this.props.children }
+                <div className="mx_AuthPage_modal">
+                    { this.props.children }
+                </div>
             </div>
         );
     },