diff --git a/ui/src/admin/components/chronograf/UsersTable.js b/ui/src/admin/components/chronograf/UsersTable.js
index 8607d0588..845ac2a6f 100644
--- a/ui/src/admin/components/chronograf/UsersTable.js
+++ b/ui/src/admin/components/chronograf/UsersTable.js
@@ -4,9 +4,11 @@ import _ from 'lodash'
 
 import Authorized, {SUPERADMIN_ROLE} from 'src/auth/Authorized'
 
+import UsersTableHeader from 'src/admin/components/chronograf/UsersTableHeader'
 import UsersTableRow from 'src/admin/components/chronograf/UsersTableRow'
 import OrgTableRow from 'src/admin/components/chronograf/OrgTableRow'
 import NewUserTableRow from 'src/admin/components/chronograf/NewUserTableRow'
+import BatchActionsBar from 'src/admin/components/chronograf/BatchActionsBar'
 
 import {DEFAULT_ORG_NAME} from 'src/admin/constants/dummyUsers'
 import {USERS_TABLE} from 'src/admin/constants/chronografTableSizing'
@@ -67,91 +69,112 @@ class ChronografUsersTable extends Component {
     const areAllSelected = this.areSameUsers(filteredUsers, selectedUsers)
 
     return (
-      <table className="table table-highlight v-center chronograf-admin-table">
-        <thead>
-          <tr>
-            <th className="chronograf-admin-table--check-col">
-              <div
-                className={
-                  areAllSelected ? 'user-checkbox selected' : 'user-checkbox'
-                }
-                onClick={onToggleAllUsersSelected(areAllSelected)}
-              />
-            </th>
-            <th>Username</th>
-            <th style={{width: colOrg}} className="align-with-col-text">
-              Organization
-            </th>
-            <th style={{width: colRole}} className="align-with-col-text">
-              Role
-            </th>
-            <Authorized requiredRole={SUPERADMIN_ROLE}>
-              <th style={{width: colSuperAdmin}} className="text-center">
-                SuperAdmin
-              </th>
-            </Authorized>
-            <th style={{width: colProvider}}>Provider</th>
-            <th style={{width: colScheme}}>Scheme</th>
-            <th className="text-right" style={{width: colActions}} />
-          </tr>
-        </thead>
-        <tbody>
-          {isCreatingUser
-            ? <NewUserTableRow
-                currentOrganization={currentOrganization}
-                organizations={organizations}
-                roles={userRoles}
-                onBlur={onBlurCreateUserRow}
-                onCreateUser={onCreateUser}
-              />
-            : null}
-          {filteredUsers.length
-            ? filteredUsers.map(
-                (user, i) =>
-                  organization.name === DEFAULT_ORG_NAME
-                    ? <UsersTableRow
-                        user={user}
-                        key={i}
-                        organizations={organizations}
-                        onToggleUserSelected={onToggleUserSelected}
-                        selectedUsers={selectedUsers}
-                        isSameUser={isSameUser}
-                        onSelectAddUserToOrg={this.handleSelectAddUserToOrg(
-                          user
-                        )}
-                        onChangeUserRole={this.handleChangeUserRole}
-                        onChooseFilter={this.handleChooseFilter}
-                        onChangeSuperAdmin={this.handleChangeSuperAdmin}
-                      />
-                    : <OrgTableRow
-                        user={user}
-                        key={i}
-                        onToggleUserSelected={onToggleUserSelected}
-                        selectedUsers={selectedUsers}
-                        isSameUser={isSameUser}
-                        organization={organization}
-                        onSelectAddUserToOrg={this.handleSelectAddUserToOrg(
-                          user
-                        )}
-                        onChangeUserRole={this.handleChangeUserRole}
-                      />
-              )
-            : <tr className="table-empty-state">
-                <Authorized
-                  requiredRole={SUPERADMIN_ROLE}
-                  replaceWith={
-                    <th colSpan="6">
-                      <p>No Users to display</p>
-                    </th>
-                  }
-                >
-                  <th colSpan="7">
-                    <p>No Users to display</p>
+      <div className="panel panel-minimal">
+        <UsersTableHeader
+          organizationName={organization.name}
+          organizations={organizations}
+          onFilterUsers={this.handleFilterUsers}
+          onCreateUserRow={this.handleClickCreateUserRow}
+        />
+        <BatchActionsBar
+          numUsersSelected={selectedUsers.length}
+          organizationName={organization.name}
+          organizations={organizations}
+          onDeleteUsers={this.handleBatchDeleteUsers}
+          onAddUsersToOrg={this.handleBatchAddUsersToOrg}
+          onRemoveUsersFromOrg={this.handleBatchRemoveUsersFromOrg}
+          onChangeRoles={this.handleBatchChangeUsersRole}
+        />
+        <div className="panel-body">
+          <table className="table table-highlight v-center chronograf-admin-table">
+            <thead>
+              <tr>
+                <th className="chronograf-admin-table--check-col">
+                  <div
+                    className={
+                      areAllSelected
+                        ? 'user-checkbox selected'
+                        : 'user-checkbox'
+                    }
+                    onClick={onToggleAllUsersSelected(areAllSelected)}
+                  />
+                </th>
+                <th>Username</th>
+                <th style={{width: colOrg}} className="align-with-col-text">
+                  Organization
+                </th>
+                <th style={{width: colRole}} className="align-with-col-text">
+                  Role
+                </th>
+                <Authorized requiredRole={SUPERADMIN_ROLE}>
+                  <th style={{width: colSuperAdmin}} className="text-center">
+                    SuperAdmin
                   </th>
                 </Authorized>
-              </tr>}
-        </tbody>
-      </table>
+                <th style={{width: colProvider}}>Provider</th>
+                <th style={{width: colScheme}}>Scheme</th>
+                <th className="text-right" style={{width: colActions}} />
+              </tr>
+            </thead>
+            <tbody>
+              {isCreatingUser
+                ? <NewUserTableRow
+                    currentOrganization={currentOrganization}
+                    organizations={organizations}
+                    roles={userRoles}
+                    onBlur={onBlurCreateUserRow}
+                    onCreateUser={onCreateUser}
+                  />
+                : null}
+              {filteredUsers.length
+                ? filteredUsers.map(
+                    (user, i) =>
+                      organization.name === DEFAULT_ORG_NAME
+                        ? <UsersTableRow
+                            user={user}
+                            key={i}
+                            organizations={organizations}
+                            onToggleUserSelected={onToggleUserSelected}
+                            selectedUsers={selectedUsers}
+                            isSameUser={isSameUser}
+                            onSelectAddUserToOrg={this.handleSelectAddUserToOrg(
+                              user
+                            )}
+                            onChangeUserRole={this.handleChangeUserRole}
+                            onChooseFilter={this.handleChooseFilter}
+                            onChangeSuperAdmin={this.handleChangeSuperAdmin}
+                          />
+                        : <OrgTableRow
+                            user={user}
+                            key={i}
+                            onToggleUserSelected={onToggleUserSelected}
+                            selectedUsers={selectedUsers}
+                            isSameUser={isSameUser}
+                            organization={organization}
+                            onSelectAddUserToOrg={this.handleSelectAddUserToOrg(
+                              user
+                            )}
+                            onChangeUserRole={this.handleChangeUserRole}
+                          />
+                  )
+                : <tr className="table-empty-state">
+                    <Authorized
+                      requiredRole={SUPERADMIN_ROLE}
+                      replaceWith={
+                        <th colSpan="6">
+                          <p>No Users to display</p>
+                        </th>
+                      }
+                    >
+                      <th colSpan="7">
+                        <p>No Users to display</p>
+                      </th>
+                    </Authorized>
+                  </tr>}
+            </tbody>
+          </table>
+        </div>
+      </div>
     )
   }
 }
diff --git a/ui/src/admin/containers/AdminChronografPage.js b/ui/src/admin/containers/AdminChronografPage.js
index f0ab6ab04..e2c5741c7 100644
--- a/ui/src/admin/containers/AdminChronografPage.js
+++ b/ui/src/admin/containers/AdminChronografPage.js
@@ -5,12 +5,10 @@ import {bindActionCreators} from 'redux'
 import * as adminChronografActionCreators from 'src/admin/actions/chronograf'
 import {publishAutoDismissingNotification} from 'shared/dispatchers'
 
-import Authorized, {SUPERADMIN_ROLE, MEMBER_ROLE} from 'src/auth/Authorized'
+import {MEMBER_ROLE} from 'src/auth/Authorized'
 
 import PageHeader from 'src/admin/components/chronograf/PageHeader'
-import UsersTableHeader from 'src/admin/components/chronograf/UsersTableHeader'
 import UsersTable from 'src/admin/components/chronograf/UsersTable'
-import BatchActionsBar from 'src/admin/components/chronograf/BatchActionsBar'
 import ManageOrgsOverlay from 'src/admin/components/chronograf/ManageOrgsOverlay'
 
 import FancyScrollbar from 'shared/components/FancyScrollbar'
@@ -268,52 +266,33 @@ class AdminChronografPage extends Component {
             ? <div className="container-fluid">
                 <div className="row">
                   <div className="col-xs-12">
-                    <div className="panel panel-minimal">
-                      <UsersTableHeader
-                        organizationName={organization.name}
-                        organizations={organizations}
-                        onFilterUsers={this.handleFilterUsers}
-                        onCreateUserRow={this.handleClickCreateUserRow}
-                      />
-                      <BatchActionsBar
-                        numUsersSelected={selectedUsers.length}
-                        organizationName={organization.name}
-                        organizations={organizations}
-                        onDeleteUsers={this.handleBatchDeleteUsers}
-                        onAddUsersToOrg={this.handleBatchAddUsersToOrg}
-                        onRemoveUsersFromOrg={
-                          this.handleBatchRemoveUsersFromOrg
-                        }
-                        onChangeRoles={this.handleBatchChangeUsersRole}
-                      />
-                      <div className="panel-body chronograf-admin-table--panel">
-                        <Authorized
-                          requiredRole={SUPERADMIN_ROLE}
-                          propsOverride={{organizationName: organization.name}}
-                        >
-                          <UsersTable
-                            userRoles={USER_ROLES}
-                            filteredUsers={filteredUsers} // TODO: change to users upon separating Orgs & Users views
-                            organization={organization}
-                            organizations={organizations}
-                            onFilterUsers={this.handleFilterUsers}
-                            onToggleUserSelected={this.handleToggleUserSelected}
-                            selectedUsers={selectedUsers}
-                            isSameUser={isSameUser}
-                            isCreatingUser={isCreatingUser}
-                            currentOrganization={currentOrganization}
-                            onCreateUser={this.handleCreateUser}
-                            onBlurCreateUserRow={this.handleBlurCreateUserRow}
-                            onToggleAllUsersSelected={
-                              this.handleToggleAllUsersSelected
-                            }
-                            onAddUserToOrg={this.handleAddUserToOrg}
-                            onUpdateUserRole={this.handleUpdateUserRole()}
-                            onUpdateUserSuperAdmin={this.handleUpdateUserSuperAdmin()}
-                          />
-                        </Authorized>
-                      </div>
-                    </div>
+                    <UsersTable
+                      userRoles={USER_ROLES}
+                      filteredUsers={filteredUsers} // TODO: change to users upon separating Orgs & Users views
+                      organization={organization}
+                      organizations={organizations}
+                      onFilterUsers={this.handleFilterUsers}
+                      onToggleUserSelected={this.handleToggleUserSelected}
+                      selectedUsers={selectedUsers}
+                      isSameUser={isSameUser}
+                      isCreatingUser={isCreatingUser}
+                      currentOrganization={currentOrganization}
+                      onCreateUser={this.handleCreateUser}
+                      onBlurCreateUserRow={this.handleBlurCreateUserRow}
+                      onToggleAllUsersSelected={
+                        this.handleToggleAllUsersSelected
+                      }
+                      onAddUserToOrg={this.handleAddUserToOrg}
+                      onUpdateUserRole={this.handleUpdateUserRole()}
+                      onUpdateUserSuperAdmin={this.handleUpdateUserSuperAdmin()}
+                      onCreateUserRow={this.handleClickCreateUserRow}
+                      numUsersSelected={selectedUsers.length}
+                      organizationName={organization.name}
+                      onDeleteUsers={this.handleBatchDeleteUsers}
+                      onAddUsersToOrg={this.handleBatchAddUsersToOrg}
+                      onRemoveUsersFromOrg={this.handleBatchRemoveUsersFromOrg}
+                      onChangeRoles={this.handleBatchChangeUsersRole}
+                    />
                   </div>
                 </div>
               </div>