diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 12ee56d0c..c038be7a6 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -93,7 +93,7 @@ class Comment extends React.Component {
 
     const like = getAction('LIKE', comment);
     const flag = getAction('FLAG', comment);
-
+    
     return (
       <div
         className={parentId ? `reply ${styles.Reply}` : `comment ${styles.Comment}`}
@@ -102,7 +102,9 @@ class Comment extends React.Component {
         <hr aria-hidden={true} />
         <AuthorName
           author={comment.user}/>
-        <TagLabel isStaff={isStaff(comment.tags)}/>
+        { isStaff(comment.tags)
+          ? <TagLabel isStaff={true}/>
+          : null }
         <PubDate created_at={comment.created_at} />
         <Content body={comment.body} />
           <div className="commentActionsLeft">
diff --git a/client/coral-plugin-tag-label/TagLabel.js b/client/coral-plugin-tag-label/TagLabel.js
index f9ad898ec..0bceca225 100644
--- a/client/coral-plugin-tag-label/TagLabel.js
+++ b/client/coral-plugin-tag-label/TagLabel.js
@@ -3,7 +3,7 @@ import React from 'react';
 import styles from './styles.css';
 
 const TagLabel = ({isStaff}) => <div className={`${styles.staff}`}>
-  {(isStaff) ? 'Staff' : ''}
+  {isStaff ? 'Staff' : ''}
 </div>;
 
 export default TagLabel;
diff --git a/client/coral-plugin-tag-label/styles.css b/client/coral-plugin-tag-label/styles.css
index 5408b43d4..03dc3dbc8 100644
--- a/client/coral-plugin-tag-label/styles.css
+++ b/client/coral-plugin-tag-label/styles.css
@@ -3,4 +3,5 @@
   color: white;
   display: inline-block;
   margin: 10px 10px;
+  padding: 5px 5px;
 }