diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js
index 264b1b2aa..bf1aa2292 100644
--- a/client/coral-embed-stream/src/components/Embed.js
+++ b/client/coral-embed-stream/src/components/Embed.js
@@ -38,13 +38,15 @@ export default class Embed extends React.Component {
     const {asset: {totalCommentCount}} = this.props.root;
     const {user} = this.props.auth;
 
+    console.log('activeTab', activeTab);
+
     return (
       <div>
         <div className="commentStream">
           <TabBar onChange={this.changeTab} activeTab={activeTab} className='talk-stream-tabbar'>
-            <Tab className={'talk-stream-comment-count-tab'}><Count count={totalCommentCount}/></Tab>
-            <Tab className={'talk-stream-profile-tab'}>{t('framework.my_profile')}</Tab>
-            <Tab className={'talk-stream-configuration-tab'} restricted={!can(user, 'UPDATE_CONFIG')}>{t('framework.configure_stream')}</Tab>
+            <Tab className={'talk-stream-comment-count-tab'} id='stream'><Count count={totalCommentCount}/></Tab>
+            <Tab className={'talk-stream-profile-tab'} id='profile'>{t('framework.my_profile')}</Tab>
+            <Tab className={'talk-stream-configuration-tab'} id='config' restricted={!can(user, 'UPDATE_CONFIG')}>{t('framework.configure_stream')}</Tab>
           </TabBar>
           {commentId &&
             <Button
diff --git a/client/coral-ui/components/TabBar.js b/client/coral-ui/components/TabBar.js
index d04ccc30d..7809dee11 100644
--- a/client/coral-ui/components/TabBar.js
+++ b/client/coral-ui/components/TabBar.js
@@ -23,7 +23,7 @@ class TabBar extends React.Component {
             .map((child, tabId) =>
               React.cloneElement(child, {
                 tabId,
-                active: tabId === activeTab,
+                active: child.props.id === activeTab,
                 onTabClick: this.handleClickTab,
                 cStyle
               })
diff --git a/plugins/coral-plugin-auth/client/components/UserBox.js b/plugins/coral-plugin-auth/client/components/UserBox.js
index 47608c0e3..5b79b664a 100644
--- a/plugins/coral-plugin-auth/client/components/UserBox.js
+++ b/plugins/coral-plugin-auth/client/components/UserBox.js
@@ -9,10 +9,10 @@ const UserBox = ({loggedIn, user, logout, onShowProfile}) => (
   <div>
     {
       loggedIn ? (
-        <div className={styles.userBox}>
+        <div className={`${styles.userBox} talk-stream-auth-userbox`}>
           <span className={styles.userBoxLoggedIn}>{t('sign_in.logged_in_as')}</span>
           <a onClick={onShowProfile}>{user.username}</a>. {t('sign_in.not_you')}
-          <a className={styles.logout} onClick={() => logout()}>
+          <a className={`${styles.logout} talk-stream-userbox-logout`} onClick={() => logout()}>
             {t('sign_in.logout')}
           </a>
         </div>