diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index 84f43e0ca6..e3eadddae8 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -69,12 +69,6 @@ limitations under the License.
     margin-right: 10px;
 }
 
-.mx_Login_create {
-    display: block;
-    text-align: center;
-    width: 100%;
-}
-
 .mx_Login_prompt {
     padding-top: 15px;
     padding-bottom: 15px;
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 93e7dd01e6..cb28d57801 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -30,3 +30,9 @@ limitations under the License.
     color: $accent-color;
     text-decoration: none;
 }
+
+.mx_Auth_changeFlow {
+    display: block;
+    text-align: center;
+    width: 100%;
+}
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 3ff459d20e..513be46544 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -256,7 +256,7 @@ module.exports = React.createClass({
                     </form>
                     { serverConfigSection }
                     { errorText }
-                    <a className="mx_Login_create" onClick={this.onLoginClick} href="#">
+                    <a className="mx_Auth_changeFlow" onClick={this.onLoginClick} href="#">
                         { _t('Return to login screen') }
                     </a>
                 </div>
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 611bea5284..6cc60248ab 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -526,7 +526,7 @@ module.exports = React.createClass({
         let loginAsGuestJsx;
         if (this.props.enableGuest) {
             loginAsGuestJsx =
-                <a className="mx_Login_create" onClick={this._onLoginAsGuestClick} href="#">
+                <a className="mx_Auth_changeFlow" onClick={this._onLoginAsGuestClick} href="#">
                     { _t('Try the app first') }
                 </a>;
         }
@@ -564,7 +564,7 @@ module.exports = React.createClass({
                     { errorTextSection }
                     { this.componentForStep(this.state.currentFlow) }
                     { serverConfig }
-                    <a className="mx_Login_create" onClick={this.onRegisterClick} href="#">
+                    <a className="mx_Auth_changeFlow" onClick={this.onRegisterClick} href="#">
                         { _t('Create an account') }
                     </a>
                     { loginAsGuestJsx }
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index fb913b22e1..fbc5aa1386 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -465,7 +465,7 @@ module.exports = React.createClass({
         let signIn;
         if (!this.state.doingUIAuth) {
             signIn = (
-                <a className="mx_Login_create" onClick={this.onLoginClick} href="#">
+                <a className="mx_Auth_changeFlow" onClick={this.onLoginClick} href="#">
                     { _t('I already have an account') }
                 </a>
             );