diff --git a/res/css/_components.scss b/res/css/_components.scss
index a1b575a0a1..998e1754c8 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -8,7 +8,6 @@
 @import "./structures/_GroupView.scss";
 @import "./structures/_HomePage.scss";
 @import "./structures/_LeftPanel.scss";
-@import "./structures/_LoginBox.scss";
 @import "./structures/_MatrixChat.scss";
 @import "./structures/_MyGroups.scss";
 @import "./structures/_NotificationPanel.scss";
@@ -24,6 +23,7 @@
 @import "./structures/_UserSettings.scss";
 @import "./structures/_ViewSource.scss";
 @import "./structures/auth/_Login.scss";
+@import "./views/auth/_AuthButtons.scss";
 @import "./views/auth/_InteractiveAuthEntryComponents.scss";
 @import "./views/auth/_ServerConfig.scss";
 @import "./views/avatars/_BaseAvatar.scss";
diff --git a/res/css/structures/_LoginBox.scss b/res/css/views/auth/_AuthButtons.scss
similarity index 87%
rename from res/css/structures/_LoginBox.scss
rename to res/css/views/auth/_AuthButtons.scss
index 0a3e21a980..553adeee14 100644
--- a/res/css/structures/_LoginBox.scss
+++ b/res/css/views/auth/_AuthButtons.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 OpenMarket Ltd
+Copyright 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_LoginBox {
+.mx_AuthButtons {
     min-height: 24px;
     height: unset !important;
     padding-top: 13px !important;
@@ -22,13 +23,13 @@ limitations under the License.
     order: 4;
 }
 
-.mx_LoginBox_loginButton_wrapper {
+.mx_AuthButtons_loginButton_wrapper {
     text-align: center;
     width: 100%;
 }
 
-.mx_LoginBox_loginButton,
-.mx_LoginBox_registerButton {
+.mx_AuthButtons_loginButton,
+.mx_AuthButtons_registerButton {
     margin-top: 3px;
     height: 40px;
     border: 0px;
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c34b618645..f63e5b3273 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1757,8 +1757,8 @@ module.exports = React.createClass({
         }
 
         if (MatrixClientPeg.get().isGuest()) {
-            const LoginBox = sdk.getComponent('structures.LoginBox');
-            messageComposer = <LoginBox />;
+            const AuthButtons = sdk.getComponent('views.auth.AuthButtons');
+            messageComposer = <AuthButtons />;
         }
 
         // TODO: Why aren't we storing the term/scope/count in this format
diff --git a/src/components/structures/LoginBox.js b/src/components/views/auth/AuthButtons.js
similarity index 67%
rename from src/components/structures/LoginBox.js
rename to src/components/views/auth/AuthButtons.js
index 168014daa5..35bfabbbca 100644
--- a/src/components/structures/LoginBox.js
+++ b/src/components/views/auth/AuthButtons.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
-import { _t } from '../../languageHandler';
-const dis = require('../../dispatcher');
-const AccessibleButton = require('../../components/views/elements/AccessibleButton');
+import { _t } from '../../../languageHandler';
+const dis = require('../../../dispatcher');
+const AccessibleButton = require('../elements/AccessibleButton');
 
 module.exports = React.createClass({
-    displayName: 'LoginBox',
+    displayName: 'AuthButtons',
 
     propTypes: {
     },
@@ -38,18 +38,18 @@ module.exports = React.createClass({
 
     render: function() {
         const loginButton = (
-            <div className="mx_LoginBox_loginButton_wrapper">
-                <AccessibleButton className="mx_LoginBox_loginButton" element="button" onClick={this.onLoginClick}>
+            <div className="mx_AuthButtons_loginButton_wrapper">
+                <AccessibleButton className="mx_AuthButtons_loginButton" element="button" onClick={this.onLoginClick}>
                     { _t("Login") }
                 </AccessibleButton>
-                <AccessibleButton className="mx_LoginBox_registerButton" element="button" onClick={this.onRegisterClick}>
+                <AccessibleButton className="mx_AuthButtons_registerButton" element="button" onClick={this.onRegisterClick}>
                     { _t("Register") }
                 </AccessibleButton>
             </div>
         );
 
         return (
-            <div className="mx_LoginBox">
+            <div className="mx_AuthButtons">
                 { loginButton }
             </div>
         );