diff --git a/web/react/components/post_header.jsx b/web/react/components/post_header.jsx
index 76b3a64be3..f18024343a 100644
--- a/web/react/components/post_header.jsx
+++ b/web/react/components/post_header.jsx
@@ -34,7 +34,7 @@ export default class PostHeader extends React.Component {
             userProfile = (
                 <UserProfile
                     userId={''}
-                    overwriteName={''}
+                    overwriteName={Constants.SYSTEM_MESSAGE_PROFILE_NAME}
                     overwriteImage={Constants.SYSTEM_MESSAGE_PROFILE_IMAGE}
                     disablePopover={true}
                 />
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index 8178c59023..dd9a793bea 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -167,7 +167,7 @@ export default class RhsRootPost extends React.Component {
             userProfile = (
                 <UserProfile
                     userId={''}
-                    overwriteName={''}
+                    overwriteName={Constants.SYSTEM_MESSAGE_PROFILE_NAME}
                     overwriteImage={Constants.SYSTEM_MESSAGE_PROFILE_IMAGE}
                     disablePopover={true}
                 />
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 170a16049b..b4d56bccb7 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -121,6 +121,7 @@ export default {
     POST_DELETED: 'deleted',
     POST_TYPE_JOIN_LEAVE: 'system_join_leave',
     SYSTEM_MESSAGE_PREFIX: 'system_',
+    SYSTEM_MESSAGE_PROFILE_NAME: 'System',
     SYSTEM_MESSAGE_PROFILE_IMAGE: '/static/images/logo_compact.png',
     RESERVED_TEAM_NAMES: [
         'www',
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 2ddde0c50a..81cc311e1e 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -373,10 +373,6 @@ body.ios {
 		background-color: beige;
 	}
 
-	&.post--system .post__header .col__name {
-		display: none;
-	}
-
 	ul {
 		margin: 0;
 		padding: 0;