diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 87e8c7d131..b2dc2a47eb 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -234,8 +234,6 @@ module.exports = React.createClass({
                 errorText = <div className="mx_Login_error">{ err }</div>;
             }
 
-            const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector');
-
             resetPasswordJsx = (
             <div>
                 <div className="mx_Login_prompt">
@@ -271,7 +269,6 @@ module.exports = React.createClass({
                     <a className="mx_Login_create" onClick={this.onRegisterClick} href="#">
                         { _t('Create an account') }
                     </a>
-                    <LanguageSelector />
                 </div>
             </div>
             );
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 28bed9af05..28c4a3e960 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -555,8 +555,6 @@ module.exports = React.createClass({
             );
         }
 
-        const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector');
-
         return (
             <AuthPage>
                 <AuthHeader />
@@ -569,7 +567,6 @@ module.exports = React.createClass({
                         { _t('Create an account') }
                     </a>
                     { loginAsGuestJsx }
-                    <LanguageSelector />
                 </AuthBody>
             </AuthPage>
         );
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index fe6fb078e3..fb913b22e1 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -471,8 +471,6 @@ module.exports = React.createClass({
             );
         }
 
-        const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector');
-
         return (
             <AuthPage>
                 <AuthHeader
@@ -486,7 +484,6 @@ module.exports = React.createClass({
                     { registerBody }
                     { signIn }
                     { errorText }
-                    <LanguageSelector />
                 </AuthBody>
             </AuthPage>
         );
diff --git a/src/components/views/auth/AuthHeader.js b/src/components/views/auth/AuthHeader.js
index c1d831a70a..cc70d126e8 100644
--- a/src/components/views/auth/AuthHeader.js
+++ b/src/components/views/auth/AuthHeader.js
@@ -25,10 +25,12 @@ module.exports = React.createClass({
 
     render: function() {
         const AuthHeaderLogo = sdk.getComponent('auth.AuthHeaderLogo');
+        const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector');
 
         return (
             <div className="mx_AuthHeader">
                 <AuthHeaderLogo />
+                <LanguageSelector />
             </div>
         );
     },