2 files changed, 6 insertions, 7 deletions

diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx
index 4c56db0a1..9b0701583 100644
--- a/web/react/components/user_settings/manage_outgoing_hooks.jsx
+++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx
@@ -6,7 +6,6 @@ var Constants = require('../../utils/constants.jsx');
 var ChannelStore = require('../../stores/channel_store.jsx');
 var LoadingScreen = require('../loading_screen.jsx');
 
-
 export default class ManageOutgoingHooks extends React.Component {
     constructor() {
         super();
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index 61d49acb2..2b904763c 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -37,18 +37,18 @@ function getNotificationsStateFromStores() {
         if (user.notify_props.mention_keys) {
             var keys = user.notify_props.mention_keys.split(',');
 
-            if (keys.indexOf(user.username) !== -1) {
+            if (keys.indexOf(user.username) === -1) {
+                usernameKey = false;
+            } else {
                 usernameKey = true;
                 keys.splice(keys.indexOf(user.username), 1);
-            } else {
-                usernameKey = false;
             }
 
-            if (keys.indexOf('@' + user.username) !== -1) {
+            if (keys.indexOf('@' + user.username) === -1) {
+                mentionKey = false;
+            } else {
                 mentionKey = true;
                 keys.splice(keys.indexOf('@' + user.username), 1);
-            } else {
-                mentionKey = false;
             }
 
             customKeys = keys.join(',');