diff --git a/webapp/components/post_header.jsx b/webapp/components/post_header.jsx
index 2b139471db..6fae092e55 100644
--- a/webapp/components/post_header.jsx
+++ b/webapp/components/post_header.jsx
@@ -32,7 +32,7 @@ export default class PostHeader extends React.Component {
                 );
             }
 
-            botIndicator = <li className='col col__name bot-indicator'>{'BOT'}</li>;
+            botIndicator = <li className='col col__name bot-indicator'>{Constants.BOT_NAME}</li>;
         } else if (Utils.isSystemMessage(post)) {
             userProfile = (
                 <UserProfile
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 17f83170db..a771803b84 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -151,6 +151,11 @@ export default class RhsComment extends React.Component {
 
         var timestamp = this.props.currentUser.update_at;
 
+        let botIndicator;
+
+        if (post.props && post.props.from_webhook) {
+            botIndicator = <li className='col col__name bot-indicator'>{Constants.BOT_NAME}</li>;
+        }
         let loading;
         let postClass = '';
         let message = (
@@ -206,9 +211,10 @@ export default class RhsComment extends React.Component {
                     </div>
                     <div>
                         <ul className='post__header'>
-                            <li className='col__name'>
+                            <li className='col col__name'>
                                 <strong><UserProfile user={this.props.user}/></strong>
                             </li>
+                            {botIndicator}
                             <li className='col'>
                                 <time className='post__time'>
                                     <FormattedDate
diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx
index 64413a0449..708b148d8f 100644
--- a/webapp/components/search_results_item.jsx
+++ b/webapp/components/search_results_item.jsx
@@ -67,6 +67,12 @@ export default class SearchResultsItem extends React.Component {
             disableProfilePopover = true;
         }
 
+        let botIndicator;
+
+        if (post.props && post.props.from_webhook) {
+            botIndicator = <li className='col col__name bot-indicator'>{Constants.BOT_NAME}</li>;
+        }
+
         return (
             <div className='search-item__container'>
                 <div className='date-separator'>
@@ -94,13 +100,14 @@ export default class SearchResultsItem extends React.Component {
                         </div>
                         <div>
                             <ul className='post__header'>
-                                <li className='col__name'><strong>
+                                <li className='col col__name'><strong>
                                     <UserProfile
                                         user={user}
                                         overwriteName={overrideUsername}
                                         disablePopover={disableProfilePopover}
                                     />
                                 </strong></li>
+                                {botIndicator}
                                 <li className='col'>
                                     <time className='search-item-time'>
                                         <FormattedDate
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index e537017558..0e2ae07eaf 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -737,5 +737,6 @@ export default {
     EMOJI_PATH: '/static/emoji',
     DEFAULT_WEBHOOK_LOGO: logoWebhook,
     MHPNS: 'https://push.mattermost.com',
-    MTPNS: 'http://push-test.mattermost.com'
+    MTPNS: 'http://push-test.mattermost.com',
+    BOT_NAME: 'BOT'
 };