diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 7593e50a48..e82fe1b767 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -1,14 +1,12 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Navbar = require('../../components/navbar.jsx');
 var AdminSidebar = require('./admin_sidebar.jsx');
 var AdminStore = require('../../stores/admin_store.jsx');
 var AsyncClient = require('../../utils/async_client.jsx');
 var LoadingScreen = require('../loading_screen.jsx');
 
 var EmailSettingsTab = require('./email_settings.jsx');
-var JobsSettingsTab = require('./jobs_settings.jsx');
 var LogSettingsTab = require('./log_settings.jsx');
 var LogsTab = require('./logs.jsx');
 
@@ -51,12 +49,10 @@ export default class AdminController extends React.Component {
         if (this.state.config != null) {
             if (this.state.selected === 'email_settings') {
                 tab = <EmailSettingsTab config={this.state.config} />;
-            } else if (this.state.selected === 'job_settings') {
-                tab = <JobsSettingsTab config={this.state.config} />;
-            } else if (this.state.selected === 'logs') {
-                tab = <LogsTab />;
             } else if (this.state.selected === 'log_settings') {
                 tab = <LogSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'logs') {
+                tab = <LogsTab />;
             }
         }
 
@@ -72,7 +68,6 @@ export default class AdminController extends React.Component {
                 />
                 <div className='inner__wrap channel__wrap'>
                     <div className='row header'>
-                        <Navbar teamDisplayName='Admin Console' />
                     </div>
                     <div className='row main'>
                         <div
diff --git a/web/react/components/admin_console/admin_navbar_dropdown.jsx b/web/react/components/admin_console/admin_navbar_dropdown.jsx
new file mode 100644
index 0000000000..a3ab81079f
--- /dev/null
+++ b/web/react/components/admin_console/admin_navbar_dropdown.jsx
@@ -0,0 +1,102 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var Utils = require('../../utils/utils.jsx');
+var Client = require('../../utils/client.jsx');
+var TeamStore = require('../../stores/team_store.jsx');
+
+var Constants = require('../../utils/constants.jsx');
+
+function getStateFromStores() {
+    return {currentTeam: TeamStore.getCurrent()};
+}
+
+export default class AdminNavbarDropdown extends React.Component {
+    constructor(props) {
+        super(props);
+        this.blockToggle = false;
+
+        this.handleLogoutClick = this.handleLogoutClick.bind(this);
+
+        this.state = getStateFromStores();
+    }
+
+    handleLogoutClick(e) {
+        e.preventDefault();
+        Client.logout();
+    }
+
+    componentDidMount() {
+        $(React.findDOMNode(this.refs.dropdown)).on('hide.bs.dropdown', () => {
+            this.blockToggle = true;
+            setTimeout(() => {
+                this.blockToggle = false;
+            }, 100);
+        });
+    }
+
+    componentWillUnmount() {
+        $(React.findDOMNode(this.refs.dropdown)).off('hide.bs.dropdown');
+    }
+
+    render() {
+        return (
+            <ul className='nav navbar-nav navbar-right'>
+                <li
+                    ref='dropdown'
+                    className='dropdown'
+                >
+                    <a
+                        href='#'
+                        className='dropdown-toggle'
+                        data-toggle='dropdown'
+                        role='button'
+                        aria-expanded='false'
+                    >
+                        <span
+                            className='dropdown__icon'
+                            dangerouslySetInnerHTML={{__html: Constants.MENU_ICON}}
+                        />
+                    </a>
+                    <ul
+                        className='dropdown-menu'
+                        role='menu'
+                    >
+                        <li>
+                            <a
+                                href={Utils.getWindowLocationOrigin() + '/' + this.state.currentTeam.name}
+                            >
+                                {'Switch to ' + this.state.currentTeam.display_name}
+                            </a>
+                        </li>
+                        <li>
+                            <a
+                                href='#'
+                                onClick={this.handleLogoutClick}
+                            >
+                                {'Logout'}
+                            </a>
+                        </li>
+                        <li className='divider'></li>
+                        <li>
+                            <a
+                                target='_blank'
+                                href='/static/help/help.html'
+                            >
+                                {'Help'}
+                            </a>
+                        </li>
+                        <li>
+                            <a
+                                target='_blank'
+                                href='/static/help/report_problem.html'
+                            >
+                                {'Report a Problem'}
+                            </a>
+                        </li>
+                    </ul>
+                </li>
+            </ul>
+        );
+    }
+}
\ No newline at end of file
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 855da398b5..a6e689490e 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SidebarHeader = require('../sidebar_header.jsx');
+var AdminSidebarHeader = require('./admin_sidebar_header.jsx');
 
 export default class AdminSidebar extends React.Component {
     constructor(props) {
@@ -14,7 +14,8 @@ export default class AdminSidebar extends React.Component {
         };
     }
 
-    handleClick(name) {
+    handleClick(name, e) {
+        e.preventDefault();
         this.props.selectTab(name);
     }
 
@@ -27,46 +28,13 @@ export default class AdminSidebar extends React.Component {
     }
 
     componentDidMount() {
-        // $('.nav__menu-item').on('click', function clickme(e) {
-        //     e.preventDefault();
-        //     $(this).closest('.sidebar--collapsable').find('.nav__menu-item').removeClass('active');
-        //     $(this).addClass('active');
-        //     $(this).closest('.sidebar--collapsable').find('.nav__sub-menu').addClass('hide');
-        //     $(this).next('.nav__sub-menu').removeClass('hide');
-        // });
-
-        // $('.nav__sub-menu a').on('click', function clickme(e) {
-        //     e.preventDefault();
-        //     $(this).closest('.nav__sub-menu').find('a').removeClass('active');
-        //     $(this).addClass('active');
-        // });
-
-        // $('.nav__sub-menu-item').on('click', function clickme(e) {
-        //     e.preventDefault();
-        //     $(this).closest('.sidebar--collapsable').find('.nav__inner-menu').addClass('hide');
-        //     $(this).closest('li').next('li').find('.nav__inner-menu').removeClass('hide');
-        //     $(this).closest('li').next('li').find('.nav__inner-menu li:first a').addClass('active');
-        // });
-
-        // $('.nav__inner-menu a').on('click', function clickme() {
-        //     $(this).closest('.nav__inner-menu').closest('li').prev('li').find('a').addClass('active');
-        // });
-
-        // $('.nav__sub-menu .menu__close').on('click', function close() {
-        //     var menuItem = $(this).closest('li');
-        //     menuItem.next('li').remove();
-        //     menuItem.remove();
-        // });
     }
 
     render() {
         return (
             <div className='sidebar--left sidebar--collapsable'>
                 <div>
-                    <SidebarHeader
-                        teamDisplayName='Admin Console'
-                        teamType='I'
-                    />
+                    <AdminSidebarHeader />
                     <ul className='nav nav-pills nav-stacked'>
                         <li>
                             <ul className='nav nav__sub-menu'>
@@ -74,7 +42,7 @@ export default class AdminSidebar extends React.Component {
                                     <a
                                         href='#'
                                         className={this.isSelected('email_settings')}
-                                        onClick={this.handleClick.bind(null, 'email_settings')}
+                                        onClick={this.handleClick.bind(this, 'email_settings')}
                                     >
                                         {'Email Settings'}
                                     </a>
@@ -83,7 +51,7 @@ export default class AdminSidebar extends React.Component {
                                     <a
                                         href='#'
                                         className={this.isSelected('log_settings')}
-                                        onClick={this.handleClick.bind(null, 'log_settings')}
+                                        onClick={this.handleClick.bind(this, 'log_settings')}
                                     >
                                         {'Log Settings'}
                                     </a>
@@ -92,20 +60,11 @@ export default class AdminSidebar extends React.Component {
                                     <a
                                         href='#'
                                         className={this.isSelected('logs')}
-                                        onClick={this.handleClick.bind(null, 'logs')}
+                                        onClick={this.handleClick.bind(this, 'logs')}
                                     >
                                         {'Logs'}
                                     </a>
                                 </li>
-                                <li>
-                                    <a
-                                        href='#'
-                                        className={this.isSelected('job_settings')}
-                                        onClick={this.handleClick.bind(null, 'job_settings')}
-                                    >
-                                        {'Job Settings'}
-                                    </a>
-                                </li>
                             </ul>
                         </li>
                     </ul>
diff --git a/web/react/components/admin_console/admin_sidebar_header.jsx b/web/react/components/admin_console/admin_sidebar_header.jsx
index 959411f1ea..81798da455 100644
--- a/web/react/components/admin_console/admin_sidebar_header.jsx
+++ b/web/react/components/admin_console/admin_sidebar_header.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var NavbarDropdown = require('./navbar_dropdown.jsx');
-var UserStore = require('../stores/user_store.jsx');
+var AdminNavbarDropdown = require('./admin_navbar_dropdown.jsx');
+var UserStore = require('../../stores/user_store.jsx');
 
 export default class SidebarHeader extends React.Component {
     constructor(props) {
@@ -12,13 +12,18 @@ export default class SidebarHeader extends React.Component {
 
         this.state = {};
     }
-    toggleDropdown() {
+
+    toggleDropdown(e) {
+        e.preventDefault();
+
         if (this.refs.dropdown.blockToggle) {
             this.refs.dropdown.blockToggle = false;
             return;
         }
+
         $('.team__header').find('.dropdown-toggle').dropdown('toggle');
     }
+
     render() {
         var me = UserStore.getCurrentUser();
         var profilePicture = null;
@@ -45,23 +50,11 @@ export default class SidebarHeader extends React.Component {
                     {profilePicture}
                     <div className='header__info'>
                         <div className='user__name'>{'@' + me.username}</div>
-                        <div className='team__name'>{this.props.teamDisplayName}</div>
+                        <div className='team__name'>{'System Console'}</div>
                     </div>
                 </a>
-                <NavbarDropdown
-                    ref='dropdown'
-                    teamType={this.props.teamType}
-                />
+                <AdminNavbarDropdown ref='dropdown' />
             </div>
         );
     }
-}
-
-SidebarHeader.defaultProps = {
-    teamDisplayName: global.window.config.SiteName,
-    teamType: ''
-};
-SidebarHeader.propTypes = {
-    teamDisplayName: React.PropTypes.string,
-    teamType: React.PropTypes.string
-};
+}
\ No newline at end of file
diff --git a/web/react/components/admin_console/jobs_settings.jsx b/web/react/components/admin_console/jobs_settings.jsx
deleted file mode 100644
index 0b4fc41855..0000000000
--- a/web/react/components/admin_console/jobs_settings.jsx
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-export default class Jobs extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.state = {
-        };
-    }
-
-    render() {
-        return (
-            <div className='wrapper--fixed'>
-                <h3>{' **************   JOB Settings'}</h3>
-                <form
-                    className='form-horizontal'
-                    role='form'
-                >
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='email'
-                        >
-                            {'Bypass Email: '}
-                            <a
-                                href='#'
-                                data-trigger='hover click'
-                                data-toggle='popover'
-                                data-position='bottom'
-                                data-content={'Here\'s some more help text inside a popover for the Bypass Email field just to show how popovers look.'}
-                            >
-                                {'(?)'}
-                            </a>
-                        </label>
-                        <div className='col-sm-8'>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='byPassEmail'
-                                    value='option1'
-                                />
-                                    {'True'}
-                            </label>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='byPassEmail'
-                                    value='option2'
-                                />
-                                    {'False'}
-                            </label>
-                            <p className='help-text'>{'This is some sample help text for the Bypass Email field'}</p>
-                        </div>
-                    </div>
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='smtpUsername'
-                        >
-                            {'SMTP Username:'}
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='email'
-                                className='form-control'
-                                id='smtpUsername'
-                                placeholder='Enter your SMTP username'
-                                value=''
-                            />
-                            <div className='help-text'>
-                                <div className='alert alert-warning'><i className='fa fa-warning'></i>{' This is some error text for the Bypass Email field'}</div>
-                            </div>
-                            <p className='help-text'>{'This is some sample help text for the SMTP username field'}</p>
-                        </div>
-                    </div>
-                    <div
-                        className='panel-group'
-                        id='accordion'
-                        role='tablist'
-                        aria-multiselectable='true'
-                    >
-                        <div className='panel panel-default'>
-                            <div
-                                className='panel-heading'
-                                role='tab'
-                                id='headingOne'
-                            >
-                                <h3 className='panel-title'>
-                                    <a
-                                        className='collapsed'
-                                        role='button'
-                                        data-toggle='collapse'
-                                        data-parent='#accordion'
-                                        href='#collapseOne'
-                                        aria-expanded='true'
-                                        aria-controls='collapseOne'
-                                    >
-                                        {'Advanced Settings '}
-                                        <i className='fa fa-plus'></i>
-                                        <i className='fa fa-minus'></i>
-                                    </a>
-                                </h3>
-                            </div>
-                            <div
-                                id='collapseOne'
-                                className='panel-collapse collapse'
-                                role='tabpanel'
-                                aria-labelledby='headingOne'
-                            >
-                                <div className='panel-body'>
-                                    <div className='form-group'>
-                                        <label
-                                            className='control-label col-sm-4'
-                                            htmlFor='feedbackUsername'
-                                        >
-                                            {'Apple push server:'}
-                                        </label>
-                                        <div className='col-sm-8'>
-                                            <input
-                                                type='text'
-                                                className='form-control'
-                                                id='feedbackUsername'
-                                                placeholder='Enter your Apple push server'
-                                                value=''
-                                            />
-                                            <p className='help-text'>{'This is some sample help text for the Apple push server field'}</p>
-                                        </div>
-                                    </div>
-                                    <div className='form-group'>
-                                        <label
-                                            className='control-label col-sm-4'
-                                            htmlFor='feedbackUsername'
-                                        >
-                                            {'Apple push certificate public:'}
-                                        </label>
-                                        <div className='col-sm-8'>
-                                            <input
-                                                type='text'
-                                                className='form-control'
-                                                id='feedbackUsername'
-                                                placeholder='Enter your public apple push certificate'
-                                                value=''
-                                            />
-                                        </div>
-                                    </div>
-                                    <div className='form-group'>
-                                        <label
-                                            className='control-label col-sm-4'
-                                            htmlFor='feedbackUsername'
-                                        >
-                                            {'Apple push certificate private:'}
-                                        </label>
-                                        <div className='col-sm-8'>
-                                            <input
-                                                type='text'
-                                                className='form-control'
-                                                id='feedbackUsername'
-                                                placeholder='Enter your private apple push certificate'
-                                                value=''
-                                            />
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <div className='col-sm-12'>
-                            <button
-                                type='submit'
-                                className='btn btn-primary'
-                            >
-                                {'Save'}
-                            </button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        );
-    }
-}
\ No newline at end of file
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 0dbbc20d4c..8d23ec6463 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -111,7 +111,7 @@ export default class ChannelHeader extends React.Component {
         const popoverContent = React.renderToString(<MessageWrapper message={channel.description}/>);
         let channelTitle = channel.display_name;
         const currentId = UserStore.getCurrentId();
-        const isAdmin = this.state.memberChannel.roles.indexOf('admin') > -1 || this.state.memberTeam.roles.indexOf('admin') > -1;
+        const isAdmin = Utils.isAdmin(this.state.memberChannel.roles) || Utils.isAdmin(this.state.memberTeam.roles);
         const isDirect = (this.state.channel.type === 'D');
 
         if (isDirect) {
diff --git a/web/react/components/channel_invite_modal.jsx b/web/react/components/channel_invite_modal.jsx
index 5feeb4e889..82fc511843 100644
--- a/web/react/components/channel_invite_modal.jsx
+++ b/web/react/components/channel_invite_modal.jsx
@@ -121,7 +121,7 @@ export default class ChannelInviteModal extends React.Component {
         var currentMember = ChannelStore.getCurrentMember();
         var isAdmin = false;
         if (currentMember) {
-            isAdmin = currentMember.roles.indexOf('admin') > -1 || UserStore.getCurrentUser().roles.indexOf('admin') > -1;
+            isAdmin = utils.isAdmin(currentMember.roles) || utils.isAdmin(UserStore.getCurrentUser().roles);
         }
 
         var content;
diff --git a/web/react/components/channel_members.jsx b/web/react/components/channel_members.jsx
index 04fa2c7a21..1eda6a1042 100644
--- a/web/react/components/channel_members.jsx
+++ b/web/react/components/channel_members.jsx
@@ -130,7 +130,7 @@ export default class ChannelMembers extends React.Component {
         const currentMember = ChannelStore.getCurrentMember();
         let isAdmin = false;
         if (currentMember) {
-            isAdmin = currentMember.roles.indexOf('admin') > -1 || UserStore.getCurrentUser().roles.indexOf('admin') > -1;
+            isAdmin = Utils.isAdmin(currentMember.roles) || Utils.isAdmin(UserStore.getCurrentUser().roles);
         }
 
         var memberList = null;
diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx
index 9a31a2e30d..158ff65beb 100644
--- a/web/react/components/member_list_item.jsx
+++ b/web/react/components/member_list_item.jsx
@@ -2,6 +2,7 @@
 // See License.txt for license information.
 
 var UserStore = require('../stores/user_store.jsx');
+const Utils = require('../utils/utils.jsx');
 
 export default class MemberListItem extends React.Component {
     constructor(props) {
@@ -26,7 +27,7 @@ export default class MemberListItem extends React.Component {
     render() {
         var member = this.props.member;
         var isAdmin = this.props.isAdmin;
-        var isMemberAdmin = member.roles.indexOf('admin') > -1;
+        var isMemberAdmin = Utils.isAdmin(member.roles);
         var timestamp = UserStore.getCurrentUser().update_at;
 
         var invite;
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index cae9f12e40..da9874b0b1 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -8,6 +8,7 @@ var ChannelStore = require('../stores/channel_store.jsx');
 var TeamStore = require('../stores/team_store.jsx');
 var MessageWrapper = require('./message_wrapper.jsx');
 var NotifyCounts = require('./notify_counts.jsx');
+const Utils = require('../utils/utils.jsx');
 
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
@@ -335,7 +336,7 @@ export default class Navbar extends React.Component {
                     options={{singleline: true, mentionHighlight: false}}
                 />
             );
-            isAdmin = this.state.member.roles.indexOf('admin') > -1;
+            isAdmin = Utils.isAdmin(this.state.member.roles);
 
             if (channel.type === 'O') {
                 channelTitle = channel.display_name;
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index b7566cfb9d..65f741e4b2 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -30,12 +30,12 @@ export default class NavbarDropdown extends React.Component {
         UserStore.addTeamsChangeListener(this.onListenerChange);
         TeamStore.addChangeListener(this.onListenerChange);
 
-        $(React.findDOMNode(this.refs.dropdown)).on('hide.bs.dropdown', function resetDropdown() {
+        $(React.findDOMNode(this.refs.dropdown)).on('hide.bs.dropdown', () => {
             this.blockToggle = true;
-            setTimeout(function blockTimeout() {
+            setTimeout(() => {
                 this.blockToggle = false;
-            }.bind(this), 100);
-        }.bind(this));
+            }, 100);
+        });
     }
     componentWillUnmount() {
         UserStore.removeTeamsChangeListener(this.onListenerChange);
@@ -53,12 +53,16 @@ export default class NavbarDropdown extends React.Component {
         var teamLink = '';
         var inviteLink = '';
         var manageLink = '';
+        var sysAdminLink = '';
+        var adminDivider = '';
         var currentUser = UserStore.getCurrentUser();
         var isAdmin = false;
+        var isSystemAdmin = false;
         var teamSettings = null;
 
         if (currentUser != null) {
-            isAdmin = currentUser.roles.indexOf('admin') > -1;
+            isAdmin = Utils.isAdmin(currentUser.roles);
+            isSystemAdmin = Utils.isInRole(currentUser.roles, 'system_admin');
 
             inviteLink = (
                 <li>
@@ -67,7 +71,7 @@ export default class NavbarDropdown extends React.Component {
                         data-toggle='modal'
                         data-target='#invite_member'
                     >
-                        Invite New Member
+                        {'Invite New Member'}
                     </a>
                 </li>
             );
@@ -82,7 +86,7 @@ export default class NavbarDropdown extends React.Component {
                             data-title='Team Invite'
                             data-value={Utils.getWindowLocationOrigin() + '/signup_user_complete/?id=' + currentUser.team_id}
                         >
-                            Get Team Invite Link
+                            {'Get Team Invite Link'}
                         </a>
                     </li>
                 );
@@ -97,19 +101,36 @@ export default class NavbarDropdown extends React.Component {
                         data-toggle='modal'
                         data-target='#team_members'
                     >
-                        Manage Team
+                        {'Manage Team'}
+                    </a>
+                </li>
+            );
+
+            adminDivider = (<li className='divider'></li>);
+
+            teamSettings = (
+                <li>
+                    <a
+                        href='#'
+                        data-toggle='modal'
+                        data-target='#team_settings'
+                    >
+                        {'Team Settings'}
+                    </a>
+                </li>
+            );
+        }
+
+        if (isSystemAdmin) {
+            sysAdminLink = (
+                <li>
+                    <a
+                        href='/admin_console'
+                    >
+                        {'System Console'}
                     </a>
                 </li>
             );
-            teamSettings = (<li>
-                                <a
-                                    href='#'
-                                    data-toggle='modal'
-                                    data-target='#team_settings'
-                                >
-                                    Team Settings
-                                </a>
-                            </li>);
         }
 
         var teams = [];
@@ -123,9 +144,9 @@ export default class NavbarDropdown extends React.Component {
         );
         if (this.state.teams.length > 1 && this.state.currentTeam) {
             var curTeamName = this.state.currentTeam.name;
-            this.state.teams.forEach(function listTeams(teamName) {
+            this.state.teams.forEach((teamName) => {
                 if (teamName !== curTeamName) {
-                    teams.push(<li key={teamName}><a href={Utils.getWindowLocationOrigin() + '/' + teamName}>Switch to {teamName}</a></li>);
+                    teams.push(<li key={teamName}><a href={Utils.getWindowLocationOrigin() + '/' + teamName}>{'Switch to ' + teamName}</a></li>);
                 }
             });
         }
@@ -135,7 +156,7 @@ export default class NavbarDropdown extends React.Component {
                             target='_blank'
                             href={Utils.getWindowLocationOrigin() + '/signup_team'}
                         >
-                            Create a New Team
+                            {'Create a New Team'}
                         </a>
                     </li>);
 
@@ -167,29 +188,31 @@ export default class NavbarDropdown extends React.Component {
                                 data-toggle='modal'
                                 data-target='#user_settings'
                             >
-                                Account Settings
+                                {'Account Settings'}
                             </a>
                         </li>
-                        {teamSettings}
                         {inviteLink}
                         {teamLink}
+                        {adminDivider}
+                        {teamSettings}
                         {manageLink}
+                        {sysAdminLink}
+                        {teams}
+                        <li className='divider'></li>
                         <li>
                             <a
                                 href='#'
                                 onClick={this.handleLogoutClick}
                             >
-                                Logout
+                                {'Logout'}
                             </a>
                         </li>
-                        {teams}
-                        <li className='divider'></li>
                         <li>
                             <a
                                 target='_blank'
                                 href='/static/help/help.html'
                             >
-                                Help
+                                {'Help'}
                             </a>
                         </li>
                         <li>
@@ -197,7 +220,7 @@ export default class NavbarDropdown extends React.Component {
                                 target='_blank'
                                 href='/static/help/report_problem.html'
                             >
-                                Report a Problem
+                                {'Report a Problem'}
                             </a>
                         </li>
                     </ul>
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index c80b287a38..34ac9e7599 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -20,7 +20,7 @@ export default class PostInfo extends React.Component {
     createDropdown() {
         var post = this.props.post;
         var isOwner = UserStore.getCurrentId() === post.user_id;
-        var isAdmin = UserStore.getCurrentUser().roles.indexOf('admin') > -1;
+        var isAdmin = utils.isAdmin(UserStore.getCurrentUser().roles);
 
         if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING || post.state === Constants.POST_DELETED) {
             return '';
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index faa5e5f0b3..94cccaac31 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -419,7 +419,7 @@ export default class PostList extends React.Component {
 
         var members = ChannelStore.getExtraInfo(channel.id).members;
         for (var i = 0; i < members.length; i++) {
-            if (members[i].roles.indexOf('admin') > -1) {
+            if (utils.isAdmin(members[i].roles)) {
                 return members[i].username;
             }
         }
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 959411f1ea..072c14e0a1 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -12,7 +12,8 @@ export default class SidebarHeader extends React.Component {
 
         this.state = {};
     }
-    toggleDropdown() {
+    toggleDropdown(e) {
+        e.preventDefault();
         if (this.refs.dropdown.blockToggle) {
             this.refs.dropdown.blockToggle = false;
             return;
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index 5ecd502ba8..2671d560b9 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -26,7 +26,7 @@ export default class SidebarRightMenu extends React.Component {
         var isAdmin = false;
 
         if (currentUser != null) {
-            isAdmin = currentUser.roles.indexOf('admin') > -1;
+            isAdmin = utils.isAdmin(currentUser.roles);
 
             inviteLink = (
                 <li>
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 032cf4ff4e..0745914891 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -54,6 +54,29 @@ export function isTestDomain() {
     return false;
 }
 
+export function isInRole(roles, inRole) {
+    var parts = roles.split(' ');
+    for (var i = 0; i < parts.length; i++) {
+        if (parts[i] === inRole) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+export function isAdmin(roles) {
+    if (isInRole(roles, 'admin')) {
+        return true;
+    }
+
+    if (isInRole(roles, 'system_admin')) {
+        return true;
+    }
+
+    return false;
+}
+
 export function getDomainWithOutSub() {
     var parts = window.location.host.split('.');
 
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index f714a23f80..94583b153a 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -11,7 +11,7 @@
         padding-top: 44px;
     }
     .dropdown-menu {
-        max-height: 300px;
+        max-height: 400px;
         overflow-x: hidden;
         overflow-y: auto;
         max-width: 200px;