3 files changed, 22 insertions, 4 deletions
diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx
index c7020fed9..bc542165a 100644
--- a/webapp/components/user_profile.jsx
+++ b/webapp/components/user_profile.jsx
@@ -79,6 +79,24 @@ export default class UserProfile extends React.Component {
             />
         );
 
+        let fullname = Utils.getFullName(this.props.user);
+        if (fullname) {
+            dataContent.push(
+                <div
+                    data-toggle='tooltip'
+                    title={fullname}
+                    key='user-popover-fullname'
+                >
+
+                    <p
+                        className='text-nowrap'
+                    >
+                        {fullname}
+                    </p>
+                </div>
+            );
+        }
+
         if (global.window.mm_config.ShowEmailAddress === 'true' || UserStore.isSystemAdminForCurrentUser() || this.props.user === UserStore.getCurrentUser()) {
             dataContent.push(
                 <div
@@ -103,7 +121,7 @@ export default class UserProfile extends React.Component {
                 rootClose={true}
                 overlay={
                     <Popover
-                        title={name}
+                        title={'@' + this.props.user.username}
                         id='user-profile-popover'
                     >
                         {dataContent}
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index d1c195c7e..e725060ab 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -27,7 +27,7 @@ const holders = defineMessages({
     },
     validEmail: {
         id: 'user.settings.general.validEmail',
-        defaultMessage: 'Please enter a valid email address'
+        defaultMessage: 'Please enter a valid email address.'
     },
     emailMatch: {
         id: 'user.settings.general.emailMatch',
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx
index 428c88e25..769959432 100644
--- a/webapp/components/user_settings/user_settings_security.jsx
+++ b/webapp/components/user_settings/user_settings_security.jsx
@@ -22,7 +22,7 @@ import {Link} from 'react-router/es6';
 const holders = defineMessages({
     currentPasswordError: {
         id: 'user.settings.security.currentPasswordError',
-        defaultMessage: 'Please enter your current password'
+        defaultMessage: 'Please enter your current password.'
     },
     passwordLengthError: {
         id: 'user.settings.security.passwordLengthError',
@@ -30,7 +30,7 @@ const holders = defineMessages({
     },
     passwordMatchError: {
         id: 'user.settings.security.passwordMatchError',
-        defaultMessage: 'The new passwords you entered do not match'
+        defaultMessage: 'The new passwords you entered do not match.'
     },
     method: {
         id: 'user.settings.security.method',