diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js
index 2e050e836..3a898295f 100644
--- a/client/coral-embed-stream/src/components/Embed.js
+++ b/client/coral-embed-stream/src/components/Embed.js
@@ -1,7 +1,6 @@
 import React from 'react';
 const lang = new I18n(translations);
 import Stream from '../containers/Stream';
-import Slot from 'coral-framework/components/Slot';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import UserBox from 'coral-sign-in/components/UserBox';
 import translations from 'coral-framework/translations';
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index e0c541341..60747e1a2 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -1,6 +1,4 @@
 import React, {PropTypes} from 'react';
-
-import {Button} from 'coral-ui';
 import LoadMore from './LoadMore';
 import NewCount from './NewCount';
 import Comment from '../containers/Comment';
@@ -16,7 +14,7 @@ import ChangeUsernameContainer
   from 'coral-sign-in/containers/ChangeUsernameContainer';
 
 class Stream extends React.Component {
-  setActiveReplyBox = reactKey => {
+  setActiveReplyBox = (reactKey) => {
     if (!this.props.auth.user) {
       this.props.showSignInDialog();
     } else {
@@ -59,11 +57,11 @@ class Stream extends React.Component {
     const firstCommentDate = asset.comments[0]
       ? asset.comments[0].created_at
       : new Date(Date.now() - 1000 * 60 * 60 * 24 * 7).toISOString();
-    const commentIsIgnored = comment => {
+    const commentIsIgnored = (comment) => {
       return (
         me &&
         me.ignoredUsers &&
-        me.ignoredUsers.find(u => u.id === comment.user.id)
+        me.ignoredUsers.find((u) => u.id === comment.user.id)
       );
     };
     return (
@@ -151,7 +149,7 @@ class Stream extends React.Component {
                 setCommentCountCache={this.props.setCommentCountCache}
               />
               <div className="embed__stream">
-                {comments.map(comment => {
+                {comments.map((comment) => {
                   return commentIsIgnored(comment)
                     ? <IgnoredCommentTombstone key={comment.id} />
                     : <Comment
diff --git a/client/coral-sign-in/containers/LoginContainer.js b/client/coral-sign-in/containers/LoginContainer.js
index fa20de4ed..8d19e5198 100644
--- a/client/coral-sign-in/containers/LoginContainer.js
+++ b/client/coral-sign-in/containers/LoginContainer.js
@@ -3,4 +3,4 @@ import Slot from 'coral-framework/components/Slot';
 
 export const LoginContainer = () => (
   <Slot fill="login"/>
-)
\ No newline at end of file
+);
diff --git a/client/coral-sign-in/containers/SignInContainer.js b/client/coral-sign-in/containers/SignInContainer.js
index b473626db..4e883c765 100644
--- a/client/coral-sign-in/containers/SignInContainer.js
+++ b/client/coral-sign-in/containers/SignInContainer.js
@@ -2,4 +2,4 @@ import React from 'react';
 
 export const SignInContainer = () => (
   <Slot fill="login"/>
-)
\ No newline at end of file
+);
diff --git a/plugins/coral-plugin-auth/client/components/SignInButton.js b/plugins/coral-plugin-auth/client/components/SignInButton.js
index fb58eeb9b..b5a88431f 100644
--- a/plugins/coral-plugin-auth/client/components/SignInButton.js
+++ b/plugins/coral-plugin-auth/client/components/SignInButton.js
@@ -4,17 +4,19 @@ import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {showSignInDialog} from 'coral-framework/actions/auth';
 
-class SignInButton extends React.Component {
-  render() {
-    return (
-      <Button id="coralSignInButton" onClick={this.props.showSignInDialog} full>
-        Sign in to comment
-      </Button>
-    );
-  }
-}
+const SignInButton = ({loggedIn, showSignInDialog}) => (
+  <div>
+    {
+      !loggedIn ? (
+        <Button id="coralSignInButton" onClick={showSignInDialog} full>
+          Sign in to comment
+        </Button>
+      ) : null
+    }
+  </div>
+);
 
-const mapStateToProps = ({auth}) => ({auth});
+const mapStateToProps = ({auth}) => ({loggedIn: auth.loggedIn});
 
 const mapDispatchToProps = dispatch =>
   bindActionCreators({showSignInDialog}, dispatch);