diff --git a/web/react/components/user_settings_notifications.jsx b/web/react/components/user_settings_notifications.jsx
index 799e4d65e2..33ae01eaac 100644
--- a/web/react/components/user_settings_notifications.jsx
+++ b/web/react/components/user_settings_notifications.jsx
@@ -9,94 +9,114 @@ var assign = require('object-assign');
 function getNotificationsStateFromStores() {
     var user = UserStore.getCurrentUser();
     var soundNeeded = !utils.isBrowserFirefox();
-    var sound = (!user.notify_props || user.notify_props.desktop_sound == undefined) ? "true" : user.notify_props.desktop_sound;
-    var desktop = (!user.notify_props || user.notify_props.desktop == undefined) ? "all" : user.notify_props.desktop;
-    var email = (!user.notify_props || user.notify_props.email == undefined) ? "true" : user.notify_props.email;
 
-    var username_key = false;
-    var mention_key = false;
-    var custom_keys = "";
-    var first_name_key = false;
-    var all_key = false;
-    var channel_key = false;
+    var sound = 'true';
+    if (user.notify_props && user.notify_props.desktop_sound) {
+        sound = user.notify_props.desktop_sound;
+    }
+    var desktop = 'all';
+    if (user.notify_props && user.notify_props.desktop) {
+        desktop = user.notify_props.desktop;
+    }
+    var email = 'true';
+    if (user.notify_props && user.notify_props.email) {
+        email = user.notify_props.email;
+    }
+
+    var usernameKey = false;
+    var mentionKey = false;
+    var customKeys = '';
+    var firstNameKey = false;
+    var allKey = false;
+    var channelKey = false;
 
     if (user.notify_props) {
-        if (user.notify_props.mention_keys !== undefined) {
+        if (user.notify_props.mention_keys) {
             var keys = user.notify_props.mention_keys.split(',');
 
             if (keys.indexOf(user.username) !== -1) {
-                username_key = true;
+                usernameKey = true;
                 keys.splice(keys.indexOf(user.username), 1);
             } else {
-                username_key = false;
+                usernameKey = false;
             }
 
-            if (keys.indexOf('@'+user.username) !== -1) {
-                mention_key = true;
-                keys.splice(keys.indexOf('@'+user.username), 1);
+            if (keys.indexOf('@' + user.username) !== -1) {
+                mentionKey = true;
+                keys.splice(keys.indexOf('@' + user.username), 1);
             } else {
-                mention_key = false;
+                mentionKey = false;
             }
 
-            custom_keys = keys.join(',');
+            customKeys = keys.join(',');
         }
 
-        if (user.notify_props.first_name !== undefined) {
-            first_name_key = user.notify_props.first_name === "true";
+        if (user.notify_props.first_name) {
+            firstNameKey = user.notify_props.first_name === 'true';
         }
 
-        if (user.notify_props.all !== undefined) {
-            all_key = user.notify_props.all === "true";
+        if (user.notify_props.all) {
+            allKey = user.notify_props.all === 'true';
         }
 
-        if (user.notify_props.channel !== undefined) {
-            channel_key = user.notify_props.channel === "true";
+        if (user.notify_props.channel) {
+            channelKey = user.notify_props.channel === 'true';
         }
     }
 
-    return { notify_level: desktop, enable_email: email, soundNeeded: soundNeeded, enable_sound: sound, username_key: username_key, mention_key: mention_key, custom_keys: custom_keys, custom_keys_checked: custom_keys.length > 0, first_name_key: first_name_key, all_key: all_key, channel_key: channel_key };
+    return {notifyLevel: desktop, enableEmail: email, soundNeeded: soundNeeded, enableSound: sound, usernameKey: usernameKey, mentionKey: mentionKey, customKeys: customKeys, customKeysChecked: customKeys.length > 0, firstNameKey: firstNameKey, allKey: allKey, channelKey: channelKey};
 }
 
-
 module.exports = React.createClass({
     displayName: 'NotificationsTab',
+    propTypes: {
+        user: React.PropTypes.object,
+        updateSection: React.PropTypes.func,
+        updateTab: React.PropTypes.func,
+        activeSection: React.PropTypes.string,
+        activeTab: React.PropTypes.string
+    },
     handleSubmit: function() {
-        data = {}
-        data["user_id"] = this.props.user.id;
-        data["email"] = this.state.enable_email;
-        data["desktop_sound"] = this.state.enable_sound;
-        data["desktop"] = this.state.notify_level;
+        var data = {};
+        data.user_id = this.props.user.id;
+        data.email = this.state.enableEmail;
+        data.desktop_sound = this.state.enableSound;
+        data.desktop = this.state.notifyLevel;
 
-        var mention_keys = [];
-        if (this.state.username_key) mention_keys.push(this.props.user.username);
-        if (this.state.mention_key) mention_keys.push('@'+this.props.user.username);
-
-        var string_keys = mention_keys.join(',');
-        if (this.state.custom_keys.length > 0 && this.state.custom_keys_checked) {
-            string_keys += ',' + this.state.custom_keys;
+        var mentionKeys = [];
+        if (this.state.usernameKey) {
+            mentionKeys.push(this.props.user.username);
+        }
+        if (this.state.mentionKey) {
+            mentionKeys.push('@' + this.props.user.username);
         }
 
-        data["mention_keys"] = string_keys;
-        data["first_name"] = this.state.first_name_key ? "true" : "false";
-        data["all"] = this.state.all_key ? "true" : "false";
-        data["channel"] = this.state.channel_key ? "true" : "false";
+        var stringKeys = mentionKeys.join(',');
+        if (this.state.customKeys.length > 0 && this.state.customKeysChecked) {
+            stringKeys += ',' + this.state.customKeys;
+        }
+
+        data.mention_keys = stringKeys;
+        data.first_name = this.state.firstNameKey.toString();
+        data.all = this.state.allKey.toString();
+        data.channel = this.state.channelKey.toString();
 
         client.updateUserNotifyProps(data,
-            function(data) {
-                this.props.updateSection("");
+            function success() {
+                this.props.updateSection('');
                 AsyncClient.getMe();
             }.bind(this),
-            function(err) {
-                this.setState({ server_error: err.message });
+            function failure(err) {
+                this.setState({serverError: err.message});
             }.bind(this)
         );
     },
     handleClose: function() {
-        $(this.getDOMNode()).find(".form-control").each(function() {
-            this.value = "";
+        $(this.getDOMNode()).find('.form-control').each(function clearField() {
+            this.value = '';
         });
 
-        this.setState(assign({},getNotificationsStateFromStores(),{server_error: null}));
+        this.setState(assign({}, getNotificationsStateFromStores(), {serverError: null}));
 
         this.props.updateTab('general');
     },
@@ -105,15 +125,15 @@ module.exports = React.createClass({
         this.props.updateSection(section);
     },
     componentDidMount: function() {
-        UserStore.addChangeListener(this._onChange);
+        UserStore.addChangeListener(this.onListenerChange);
         $('#user_settings').on('hidden.bs.modal', this.handleClose);
     },
     componentWillUnmount: function() {
-        UserStore.removeChangeListener(this._onChange);
+        UserStore.removeChangeListener(this.onListenerChange);
         $('#user_settings').off('hidden.bs.modal', this.handleClose);
         this.props.updateSection('');
     },
-    _onChange: function() {
+    onListenerChange: function() {
         var newState = getNotificationsStateFromStores();
         if (!utils.areStatesEqual(newState, this.state)) {
             this.setState(newState);
@@ -123,31 +143,31 @@ module.exports = React.createClass({
         return getNotificationsStateFromStores();
     },
     handleNotifyRadio: function(notifyLevel) {
-        this.setState({ notify_level: notifyLevel });
+        this.setState({notifyLevel: notifyLevel});
         this.refs.wrapper.getDOMNode().focus();
     },
     handleEmailRadio: function(enableEmail) {
-        this.setState({ enable_email: enableEmail });
+        this.setState({enableEmail: enableEmail});
         this.refs.wrapper.getDOMNode().focus();
     },
     handleSoundRadio: function(enableSound) {
-        this.setState({ enable_sound: enableSound });
+        this.setState({enableSound: enableSound});
         this.refs.wrapper.getDOMNode().focus();
     },
     updateUsernameKey: function(val) {
-        this.setState({ username_key: val });
+        this.setState({usernameKey: val});
     },
     updateMentionKey: function(val) {
-        this.setState({ mention_key: val });
+        this.setState({mentionKey: val});
     },
     updateFirstNameKey: function(val) {
-        this.setState({ first_name_key: val });
+        this.setState({firstNameKey: val});
     },
     updateAllKey: function(val) {
-        this.setState({ all_key: val });
+        this.setState({allKey: val});
     },
     updateChannelKey: function(val) {
-        this.setState({ channel_key: val });
+        this.setState({channelKey: val});
     },
     updateCustomMentionKeys: function() {
         var checked = this.refs.customcheck.getDOMNode().checked;
@@ -156,9 +176,9 @@ module.exports = React.createClass({
             var text = this.refs.custommentions.getDOMNode().value;
 
             // remove all spaces and split string into individual keys
-            this.setState({ custom_keys: text.replace(/ /g, ''), custom_keys_checked: true });
+            this.setState({customKeys: text.replace(/ /g, ''), customKeysChecked: true});
         } else {
-            this.setState({ custom_keys: "", custom_keys_checked: false });
+            this.setState({customKeys: '', customKeysChecked: false});
         }
     },
     onCustomChange: function() {
@@ -166,7 +186,10 @@ module.exports = React.createClass({
         this.updateCustomMentionKeys();
     },
     render: function() {
-        var server_error = this.state.server_error ? this.state.server_error : null;
+        var serverError = null;
+        if (this.state.serverError) {
+            serverError = this.state.serverError;
+        }
 
         var self = this;
 
@@ -175,9 +198,9 @@ module.exports = React.createClass({
         var desktopSection;
         if (this.props.activeSection === 'desktop') {
             var notifyActive = [false, false, false];
-            if (this.state.notify_level === "mention") {
+            if (this.state.notifyLevel === 'mention') {
                 notifyActive[1] = true;
-            } else if (this.state.notify_level === "none") {
+            } else if (this.state.notifyLevel === 'none') {
                 notifyActive[2] = true;
             } else {
                 notifyActive[0] = true;
@@ -187,21 +210,21 @@ module.exports = React.createClass({
 
             inputs.push(
                 <div>
-                    <div className="radio">
+                    <div className='radio'>
                         <label>
-                            <input type="radio" checked={notifyActive[0]} onClick={function(){self.handleNotifyRadio("all")}}>For all activity</input>
+                            <input type='radio' checked={notifyActive[0]} onClick={function(){self.handleNotifyRadio('all')}}>For all activity</input>
                         </label>
                         <br/>
                     </div>
-                    <div className="radio">
+                    <div className='radio'>
                         <label>
-                            <input type="radio" checked={notifyActive[1]} onClick={function(){self.handleNotifyRadio("mention")}}>Only for mentions and private messages</input>
+                            <input type='radio' checked={notifyActive[1]} onClick={function(){self.handleNotifyRadio('mention')}}>Only for mentions and private messages</input>
                         </label>
                         <br/>
                     </div>
-                    <div className="radio">
+                    <div className='radio'>
                         <label>
-                            <input type="radio" checked={notifyActive[2]} onClick={function(){self.handleNotifyRadio("none")}}>Never</input>
+                            <input type='radio' checked={notifyActive[2]} onClick={function(){self.handleNotifyRadio('none')}}>Never</input>
                         </label>
                     </div>
                 </div>
@@ -209,76 +232,76 @@ module.exports = React.createClass({
 
             desktopSection = (
                 <SettingItemMax
-                    title="Send desktop notifications"
+                    title='Send desktop notifications'
                     inputs={inputs}
                     submit={this.handleSubmit}
-                    server_error={server_error}
-                    updateSection={function(e){self.updateSection("");e.preventDefault();}}
+                    server_error={serverError}
+                    updateSection={function(e){self.updateSection('');e.preventDefault();}}
                 />
             );
         } else {
-            var describe = "";
-            if (this.state.notify_level === "mention") {
-                describe = "Only for mentions and private messages";
-            } else if (this.state.notify_level === "none") {
-                describe = "Never";
+            var describe = '';
+            if (this.state.notifyLevel === 'mention') {
+                describe = 'Only for mentions and private messages';
+            } else if (this.state.notifyLevel === 'none') {
+                describe = 'Never';
             } else {
-                describe = "For all activity";
+                describe = 'For all activity';
             }
 
             desktopSection = (
                 <SettingItemMin
-                    title="Send desktop notifications"
+                    title='Send desktop notifications'
                     describe={describe}
-                    updateSection={function(){self.updateSection("desktop");}}
+                    updateSection={function(){self.updateSection('desktop');}}
                 />
             );
         }
 
         var soundSection;
         if (this.props.activeSection === 'sound' && this.state.soundNeeded) {
-            var soundActive = ["",""];
-            if (this.state.enable_sound === "false") {
-                soundActive[1] = "active";
+            var soundActive = ['', ''];
+            if (this.state.enableSound === 'false') {
+                soundActive[1] = 'active';
             } else {
-                soundActive[0] = "active";
+                soundActive[0] = 'active';
             }
 
             var inputs = [];
 
             inputs.push(
                 <div>
-                    <div className="btn-group" data-toggle="buttons-radio">
-                        <button className={"btn btn-default "+soundActive[0]} onClick={function(){self.handleSoundRadio("true")}}>On</button>
-                        <button className={"btn btn-default "+soundActive[1]} onClick={function(){self.handleSoundRadio("false")}}>Off</button>
+                    <div className='btn-group' data-toggle='buttons-radio'>
+                        <button className={'btn btn-default '+soundActive[0]} onClick={function(){self.handleSoundRadio('true')}}>On</button>
+                        <button className={'btn btn-default '+soundActive[1]} onClick={function(){self.handleSoundRadio('false')}}>Off</button>
                     </div>
                 </div>
             );
 
             soundSection = (
                 <SettingItemMax
-                    title="Desktop notification sounds"
+                    title='Desktop notification sounds'
                     inputs={inputs}
                     submit={this.handleSubmit}
-                    server_error={server_error}
-                    updateSection={function(e){self.updateSection("");e.preventDefault();}}
+                    server_error={serverError}
+                    updateSection={function(e){self.updateSection('');e.preventDefault();}}
                 />
             );
         } else {
-            var describe = "";
+            var describe = '';
             if (!this.state.soundNeeded) {
-                describe = "Please configure notification sounds in your browser settings"
-            } else if (this.state.enable_sound === "false") {
-                describe = "Off";
+                describe = 'Please configure notification sounds in your browser settings'
+            } else if (this.state.enableSound === 'false') {
+                describe = 'Off';
             } else {
-                describe = "On";
+                describe = 'On';
             }
 
             soundSection = (
                 <SettingItemMin
-                    title="Desktop notification sounds"
+                    title='Desktop notification sounds'
                     describe={describe}
-                    updateSection={function(){self.updateSection("sound");}}
+                    updateSection={function(){self.updateSection('sound');}}
                     disableOpen = {!this.state.soundNeeded}
                 />
             );
@@ -286,47 +309,47 @@ module.exports = React.createClass({
 
         var emailSection;
         if (this.props.activeSection === 'email') {
-            var emailActive = ["",""];
-            if (this.state.enable_email === "false") {
-                emailActive[1] = "active";
+            var emailActive = ['',''];
+            if (this.state.enableEmail === 'false') {
+                emailActive[1] = 'active';
             } else {
-                emailActive[0] = "active";
+                emailActive[0] = 'active';
             }
 
             var inputs = [];
 
             inputs.push(
                 <div>
-                    <div className="btn-group" data-toggle="buttons-radio">
-                        <button className={"btn btn-default "+emailActive[0]} onClick={function(){self.handleEmailRadio("true")}}>On</button>
-                        <button className={"btn btn-default "+emailActive[1]} onClick={function(){self.handleEmailRadio("false")}}>Off</button>
+                    <div className='btn-group' data-toggle='buttons-radio'>
+                        <button className={'btn btn-default '+emailActive[0]} onClick={function(){self.handleEmailRadio('true')}}>On</button>
+                        <button className={'btn btn-default '+emailActive[1]} onClick={function(){self.handleEmailRadio('false')}}>Off</button>
                     </div>
-                    <div><br/>{"Email notifications are sent for mentions and private messages after you have been away from " + config.SiteName + " for 5 minutes."}</div>
+                    <div><br/>{'Email notifications are sent for mentions and private messages after you have been away from ' + config.SiteName + ' for 5 minutes.'}</div>
                 </div>
             );
 
             emailSection = (
                 <SettingItemMax
-                    title="Email notifications"
+                    title='Email notifications'
                     inputs={inputs}
                     submit={this.handleSubmit}
-                    server_error={server_error}
-                    updateSection={function(e){self.updateSection("");e.preventDefault();}}
+                    server_error={serverError}
+                    updateSection={function(e){self.updateSection('');e.preventDefault();}}
                 />
             );
         } else {
-            var describe = "";
-            if (this.state.enable_email === "false") {
-                describe = "Off";
+            var describe = '';
+            if (this.state.enableEmail === 'false') {
+                describe = 'Off';
             } else {
-                describe = "On";
+                describe = 'On';
             }
 
             emailSection = (
                 <SettingItemMin
-                    title="Email notifications"
+                    title='Email notifications'
                     describe={describe}
-                    updateSection={function(){self.updateSection("email");}}
+                    updateSection={function(){self.updateSection('email');}}
                 />
             );
         }
@@ -338,9 +361,9 @@ module.exports = React.createClass({
             if (user.first_name) {
                 inputs.push(
                     <div>
-                        <div className="checkbox">
+                        <div className='checkbox'>
                             <label>
-                                <input type="checkbox" checked={this.state.first_name_key} onChange={function(e){self.updateFirstNameKey(e.target.checked);}}>{'Your case sensitive first name "' + user.first_name + '"'}</input>
+                                <input type='checkbox' checked={this.state.firstNameKey} onChange={function(e){self.updateFirstNameKey(e.target.checked);}}>{'Your case sensitive first name "' + user.first_name + '"'}</input>
                             </label>
                         </div>
                     </div>
@@ -349,9 +372,9 @@ module.exports = React.createClass({
 
             inputs.push(
                 <div>
-                    <div className="checkbox">
+                    <div className='checkbox'>
                         <label>
-                            <input type="checkbox" checked={this.state.username_key} onChange={function(e){self.updateUsernameKey(e.target.checked);}}>{'Your non-case sensitive username "' + user.username + '"'}</input>
+                            <input type='checkbox' checked={this.state.usernameKey} onChange={function(e){self.updateUsernameKey(e.target.checked);}}>{'Your non-case sensitive username "' + user.username + '"'}</input>
                         </label>
                     </div>
                 </div>
@@ -359,9 +382,9 @@ module.exports = React.createClass({
 
             inputs.push(
                 <div>
-                    <div className="checkbox">
+                    <div className='checkbox'>
                         <label>
-                            <input type="checkbox" checked={this.state.mention_key} onChange={function(e){self.updateMentionKey(e.target.checked);}}>{'Your username mentioned "@' + user.username + '"'}</input>
+                            <input type='checkbox' checked={this.state.mentionKey} onChange={function(e){self.updateMentionKey(e.target.checked);}}>{'Your username mentioned "@' + user.username + '"'}</input>
                         </label>
                     </div>
                 </div>
@@ -369,9 +392,9 @@ module.exports = React.createClass({
 
             inputs.push(
                 <div>
-                    <div className="checkbox">
+                    <div className='checkbox'>
                         <label>
-                            <input type="checkbox" checked={this.state.all_key} onChange={function(e){self.updateAllKey(e.target.checked);}}>{'Team-wide mentions "@all"'}</input>
+                            <input type='checkbox' checked={this.state.allKey} onChange={function(e){self.updateAllKey(e.target.checked);}}>{'Team-wide mentions "@all"'}</input>
                         </label>
                     </div>
                 </div>
@@ -379,9 +402,9 @@ module.exports = React.createClass({
 
             inputs.push(
                 <div>
-                    <div className="checkbox">
+                    <div className='checkbox'>
                         <label>
-                            <input type="checkbox" checked={this.state.channel_key} onChange={function(e){self.updateChannelKey(e.target.checked);}}>{'Channel-wide mentions "@channel"'}</input>
+                            <input type='checkbox' checked={this.state.channelKey} onChange={function(e){self.updateChannelKey(e.target.checked);}}>{'Channel-wide mentions "@channel"'}</input>
                         </label>
                     </div>
                 </div>
@@ -389,34 +412,34 @@ module.exports = React.createClass({
 
             inputs.push(
                 <div>
-                    <div className="checkbox">
+                    <div className='checkbox'>
                         <label>
-                            <input ref="customcheck" type="checkbox" checked={this.state.custom_keys_checked} onChange={this.updateCustomMentionKeys}>{'Other non-case sensitive words, separated by commas:'}</input>
+                            <input ref='customcheck' type='checkbox' checked={this.state.customKeysChecked} onChange={this.updateCustomMentionKeys}>{'Other non-case sensitive words, separated by commas:'}</input>
                         </label>
                     </div>
-                    <input ref="custommentions" className="form-control mentions-input" type="text" defaultValue={this.state.custom_keys} onChange={this.onCustomChange} />
+                    <input ref='custommentions' className='form-control mentions-input' type='text' defaultValue={this.state.customKeys} onChange={this.onCustomChange} />
                 </div>
             );
 
             keysSection = (
                 <SettingItemMax
-                    title="Words that trigger mentions"
+                    title='Words that trigger mentions'
                     inputs={inputs}
                     submit={this.handleSubmit}
-                    server_error={server_error}
-                    updateSection={function(e){self.updateSection("");e.preventDefault();}}
+                    server_error={serverError}
+                    updateSection={function(e){self.updateSection('');e.preventDefault();}}
                 />
             );
         } else {
             var keys = [];
-            if (this.state.first_name_key) keys.push(user.first_name);
-            if (this.state.username_key) keys.push(user.username);
-            if (this.state.mention_key) keys.push('@'+user.username);
-            if (this.state.all_key) keys.push('@all');
-            if (this.state.channel_key) keys.push('@channel');
-            if (this.state.custom_keys.length > 0) keys = keys.concat(this.state.custom_keys.split(','));
+            if (this.state.firstNameKey) keys.push(user.first_name);
+            if (this.state.usernameKey) keys.push(user.username);
+            if (this.state.mentionKey) keys.push('@'+user.username);
+            if (this.state.allKey) keys.push('@all');
+            if (this.state.channelKey) keys.push('@channel');
+            if (this.state.customKeys.length > 0) keys = keys.concat(this.state.customKeys.split(','));
 
-            var describe = "";
+            var describe = '';
             for (var i = 0; i < keys.length; i++) {
                 describe += '"' + keys[i] + '", ';
             }
@@ -424,35 +447,35 @@ module.exports = React.createClass({
             if (describe.length > 0) {
                 describe = describe.substring(0, describe.length - 2);
             } else {
-                describe = "No words configured";
+                describe = 'No words configured';
             }
 
             keysSection = (
                 <SettingItemMin
-                    title="Words that trigger mentions"
+                    title='Words that trigger mentions'
                     describe={describe}
-                    updateSection={function(){self.updateSection("keys");}}
+                    updateSection={function(){self.updateSection('keys');}}
                 />
             );
         }
 
         return (
             <div>
-                <div className="modal-header">
-                    <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 className="modal-title" ref="title"><i className="modal-back"></i>Notifications</h4>
+                <div className='modal-header'>
+                    <button type='button' className='close' data-dismiss='modal' aria-label='Close'><span aria-hidden='true'>&times;</span></button>
+                    <h4 className='modal-title' ref='title'><i className='modal-back'></i>Notifications</h4>
                 </div>
-                <div ref="wrapper" className="user-settings">
-                    <h3 className="tab-header">Notifications</h3>
-                    <div className="divider-dark first"/>
+                <div ref='wrapper' className='user-settings'>
+                    <h3 className='tab-header'>Notifications</h3>
+                    <div className='divider-dark first'/>
                     {desktopSection}
-                    <div className="divider-light"/>
+                    <div className='divider-light'/>
                     {soundSection}
-                    <div className="divider-light"/>
+                    <div className='divider-light'/>
                     {emailSection}
-                    <div className="divider-light"/>
+                    <div className='divider-light'/>
                     {keysSection}
-                    <div className="divider-dark"/>
+                    <div className='divider-dark'/>
                 </div>
             </div>