1 files changed, 15 insertions, 8 deletions

diff --git a/web/react/components/post_header.jsx b/web/react/components/post_header.jsx
index c2cadb742..dd79b3e36 100644
--- a/web/react/components/post_header.jsx
+++ b/web/react/components/post_header.jsx
@@ -13,19 +13,26 @@ export default class PostHeader extends React.Component {
         var post = this.props.post;
 
         let userProfile = <UserProfile userId={post.user_id} />;
-        if (post.props && post.props.override_username) {
-            userProfile = (
-                <UserProfile
-                    userId={post.user_id}
-                    overwriteName={post.props.override_username}
-                    disablePopover={true}
-                />
-            );
+        let botIndicator;
+
+        if (post.props && post.props.from_webhook) {
+            if (post.props.override_username && global.window.config.EnablePostUsernameOverride === 'true') {
+                userProfile = (
+                    <UserProfile
+                        userId={post.user_id}
+                        overwriteName={post.props.override_username}
+                        disablePopover={true}
+                    />
+                );
+            }
+
+            botIndicator = <li className='post-header-col post-header__name bot-indicator'>{'BOT'}</li>;
         }
 
         return (
             <ul className='post-header post-header-post'>
                 <li className='post-header-col post-header__name'><strong>{userProfile}</strong></li>
+                {botIndicator}
                 <li className='post-info--hidden'>
                     <PostInfo
                         post={post}