diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3ff72b4e5b..44ab922df4 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1714,11 +1714,6 @@ module.exports = React.createClass({
                 />;
         }
 
-        if (MatrixClientPeg.get().isGuest()) {
-            const AuthButtons = sdk.getComponent('views.auth.AuthButtons');
-            messageComposer = <AuthButtons />;
-        }
-
         // TODO: Why aren't we storing the term/scope/count in this format
         // in this.state if this is what RoomHeader desires?
         if (this.state.searchResults) {
diff --git a/src/components/views/auth/AuthButtons.js b/src/components/views/auth/AuthButtons.js
deleted file mode 100644
index 35bfabbbca..0000000000
--- a/src/components/views/auth/AuthButtons.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-'use strict';
-
-const React = require('react');
-import { _t } from '../../../languageHandler';
-const dis = require('../../../dispatcher');
-const AccessibleButton = require('../elements/AccessibleButton');
-
-module.exports = React.createClass({
-    displayName: 'AuthButtons',
-
-    propTypes: {
-    },
-
-    onLoginClick: function() {
-        dis.dispatch({ action: 'start_login' });
-    },
-
-    onRegisterClick: function() {
-        dis.dispatch({ action: 'start_registration' });
-    },
-
-    render: function() {
-        const loginButton = (
-            <div className="mx_AuthButtons_loginButton_wrapper">
-                <AccessibleButton className="mx_AuthButtons_loginButton" element="button" onClick={this.onLoginClick}>
-                    { _t("Login") }
-                </AccessibleButton>
-                <AccessibleButton className="mx_AuthButtons_registerButton" element="button" onClick={this.onRegisterClick}>
-                    { _t("Register") }
-                </AccessibleButton>
-            </div>
-        );
-
-        return (
-            <div className="mx_AuthButtons">
-                { loginButton }
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index b21f1a503d..b4737cab42 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -17,12 +17,12 @@ limitations under the License.
 
 'use strict';
 
-const React = require('react');
+import React from 'react';
 import PropTypes from 'prop-types';
-const sdk = require('../../../index');
-const MatrixClientPeg = require('../../../MatrixClientPeg');
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import dis from '../../../dispatcher';
 import classNames from 'classnames';
-
 import { _t } from '../../../languageHandler';
 
 const MessageCase = Object.freeze({
@@ -112,11 +112,14 @@ module.exports = React.createClass({
                 return MessageCase.Busy;
             }
         }
-        const myMember = this.props.room ?
+        const isGuest = MatrixClientPeg.get().isGuest();
+        const myMember = !isGuest && this.props.room ?
             this.props.room.getMember(MatrixClientPeg.get().getUserId()) :
             null;
 
-        if (this.props.inviterName) {
+        if (isGuest) {
+            return MessageCase.NotLoggedIn;
+        } else if (this.props.inviterName) {
             if (this.props.invitedEmail) {
                 if (this.state.threePidFetchError) {
                     return MessageCase.OtherThreePIDError;
@@ -170,6 +173,14 @@ module.exports = React.createClass({
         return this.props.room ? this.props.room.name : (this.props.room_alias || _t("This room"));
     },
 
+    onLoginClick: function() {
+        dis.dispatch({ action: 'start_login' });
+    },
+
+    onRegisterClick: function() {
+        dis.dispatch({ action: 'start_registration' });
+    },
+
     render: function() {
         let showSpinner = false;
         let darkStyle = false;
@@ -195,9 +206,9 @@ module.exports = React.createClass({
                 darkStyle = true;
                 title = _t("Join the conversation with an account");
                 primaryActionLabel = _t("Sign Up");
-                primaryActionHandler = this.props.onSignUpClick;
+                primaryActionHandler = this.onRegisterClick;
                 secondaryActionLabel = _t("Sign In");
-                secondaryActionHandler = this.props.onSignInClick;
+                secondaryActionHandler = this.onLoginClick;
                 break;
             }
             case MessageCase.Kicked: {