diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index b05629003e..d342de6d75 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -95,6 +95,10 @@ limitations under the License.
     }
 }
 
+.mx_AuthBody_noHeader {
+    border-radius: 4px;
+}
+
 .mx_AuthBody_editServerDetails {
     padding-left: 1em;
     font-size: 12px;
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 741306a68b..89711fcb1d 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -77,7 +77,6 @@ export default class CompleteSecurity extends React.Component {
 
     render() {
         const AuthPage = sdk.getComponent("auth.AuthPage");
-        const AuthHeader = sdk.getComponent("auth.AuthHeader");
         const AuthBody = sdk.getComponent("auth.AuthBody");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
@@ -164,8 +163,7 @@ export default class CompleteSecurity extends React.Component {
 
         return (
             <AuthPage>
-                <AuthHeader />
-                <AuthBody>
+                <AuthBody header={false}>
                     <h2 className="mx_CompleteSecurity_header">
                         {icon}
                         {title}
diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index 9a078efb52..fe20d76afb 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -17,10 +17,25 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
 
 export default class AuthBody extends React.PureComponent {
+    static PropTypes = {
+        header: PropTypes.bool,
+    };
+
+    static defaultProps = {
+        header: true,
+    };
+
     render() {
-        return <div className="mx_AuthBody">
+        const classes = {
+            'mx_AuthBody': true,
+            'mx_AuthBody_noHeader': !this.props.header,
+        };
+
+        return <div className={classnames(classes)}>
             { this.props.children }
         </div>;
     }