diff --git a/webapp/components/post_view/components/post_header.jsx b/webapp/components/post_view/components/post_header.jsx
index 4043460a39..5e0a8a5a4c 100644
--- a/webapp/components/post_view/components/post_header.jsx
+++ b/webapp/components/post_view/components/post_header.jsx
@@ -3,6 +3,7 @@
 
 import UserProfile from 'components/user_profile.jsx';
 import PostInfo from './post_info.jsx';
+import {FormattedMessage} from 'react-intl';
 
 import * as PostUtils from 'utils/post_utils.jsx';
 
@@ -55,7 +56,12 @@ export default class PostHeader extends React.Component {
             userProfile = (
                 <UserProfile
                     user={{}}
-                    overwriteName={Constants.SYSTEM_MESSAGE_PROFILE_NAME}
+                    overwriteName={
+                        <FormattedMessage
+                            id='post_info.system'
+                            defaultMessage='System'
+                        />
+                    }
                     overwriteImage={Constants.SYSTEM_MESSAGE_PROFILE_IMAGE}
                     disablePopover={true}
                 />
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 0eb7717b3c..614ba60053 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -285,7 +285,12 @@ export default class RhsComment extends React.Component {
             userProfile = (
                 <UserProfile
                     user={{}}
-                    overwriteName={Constants.SYSTEM_MESSAGE_PROFILE_NAME}
+                    overwriteName={
+                        <FormattedMessage
+                            id='post_info.system'
+                            defaultMessage='System'
+                        />
+                    }
                     overwriteImage={Constants.SYSTEM_MESSAGE_PROFILE_IMAGE}
                     disablePopover={true}
                 />
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index a114c7385e..2942a0efc1 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -293,7 +293,12 @@ export default class RhsRootPost extends React.Component {
             userProfile = (
                 <UserProfile
                     user={{}}
-                    overwriteName={Constants.SYSTEM_MESSAGE_PROFILE_NAME}
+                    overwriteName={
+                        <FormattedMessage
+                            id='post_info.system'
+                            defaultMessage='System'
+                        />
+                    }
                     overwriteImage={Constants.SYSTEM_MESSAGE_PROFILE_IMAGE}
                     disablePopover={true}
                 />
diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx
index d9bd5c3786..8c365b6da3 100644
--- a/webapp/components/user_profile.jsx
+++ b/webapp/components/user_profile.jsx
@@ -102,7 +102,7 @@ UserProfile.defaultProps = {
 };
 UserProfile.propTypes = {
     user: React.PropTypes.object,
-    overwriteName: React.PropTypes.string,
+    overwriteName: React.PropTypes.node,
     overwriteImage: React.PropTypes.string,
     disablePopover: React.PropTypes.bool,
     displayNameType: React.PropTypes.string,
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index fd2a34f36a..560cbe5eec 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1701,6 +1701,7 @@
   "post_info.mobile.unflag": "Unflag",
   "post_info.permalink": "Permalink",
   "post_info.reply": "Reply",
+  "post_info.system": "System",
   "post_message_view.edited": "(edited)",
   "posts_view.loadMore": "Load more messages",
   "posts_view.newMsg": "New Messages",
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index bd50534f20..de720b837f 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -364,7 +364,6 @@ export const Constants = {
     POST_FAILED: 'failed',
     POST_DELETED: 'deleted',
     SYSTEM_MESSAGE_PREFIX: 'system_',
-    SYSTEM_MESSAGE_PROFILE_NAME: 'System',
     SYSTEM_MESSAGE_PROFILE_IMAGE: logoImage,
     RESERVED_TEAM_NAMES: [
         'signup',