diff --git a/Makefile b/Makefile
index 5e798ee765..573036f06e 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ travis:
 	cd web/react/ && npm run build-libs
 
 	@echo Checking for style guide compliance
-	cd web/react && $(ESLINT) --quiet components/* dispatcher/* pages/* stores/* utils/*
+	cd web/react && $(ESLINT) --ext ".jsx" --ignore-pattern node_modules --quiet .
 	@echo Running gofmt
 	$(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ mattermost.go 2>&1))
 	@echo "$(GOFMT_OUTPUT)"
@@ -143,7 +143,7 @@ install:
 
 check: install
 	@echo Running ESLint...
-	-cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/*
+	-cd web/react && $(ESLINT) --ext ".jsx" --ignore-pattern node_modules .
 	@echo Running gofmt
 	$(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ mattermost.go 2>&1))
 	@echo "$(GOFMT_OUTPUT)"
diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx
index 8b0f00083d..f8fb6d115c 100644
--- a/web/react/components/admin_console/gitlab_settings.jsx
+++ b/web/react/components/admin_console/gitlab_settings.jsx
@@ -259,7 +259,6 @@ export default class GitLabSettings extends React.Component {
     }
 }
 
-
 //config.GitLabSettings.Scope = ReactDOM.findDOMNode(this.refs.Scope).value.trim();
 //  <div className='form-group'>
 //     <label
diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx
index 4c56db0a1d..9b0701583f 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 61d49acb2a..2b904763cb 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(',');