diff --git a/frontend/app/components/admin/user/table.js b/frontend/app/components/admin/user/table.js
index b71503133..b9f5e43c0 100644
--- a/frontend/app/components/admin/user/table.js
+++ b/frontend/app/components/admin/user/table.js
@@ -6,28 +6,10 @@ export default class AdminUsersTable extends Component {
   @tracked
   isUserNew = false;
 
-  @tracked
-  users = [];
-
   sortedBy = "username";
 
   constructor() {
     super(...arguments);
-
-    if (this.args.users) {
-      this.users = this.args.users
-        .toArray()
-        .filter((user) => {
-          return !user.isDeleted;
-        })
-        .sort((userA, userB) => {
-          return userA.username == userB.username
-            ? 0
-            : userA.username < userB.username
-            ? -1
-            : 1;
-        });
-    }
   }
 
   @action
diff --git a/frontend/app/components/admin/users.js b/frontend/app/components/admin/users.js
index 80e20d594..10143c959 100644
--- a/frontend/app/components/admin/users.js
+++ b/frontend/app/components/admin/users.js
@@ -10,14 +10,8 @@ export default class UsersComponent extends Component {
   @tracked
   isUserNew = false;
 
-  @tracked
-  unlockedUsers = [];
-
   constructor() {
     super(...arguments);
-
-    if (this.args.unlockedUsers)
-      this.unlockedUsers = this.args.unlockedUsers.toArray();
   }
 
   @action
diff --git a/frontend/app/routes/admin/users.js b/frontend/app/routes/admin/users.js
index 2e50eb81d..0d2910557 100644
--- a/frontend/app/routes/admin/users.js
+++ b/frontend/app/routes/admin/users.js
@@ -1,17 +1,13 @@
 import AdminRoute from "../admin";
-import RSVP from "rsvp";
 
 export default class AdminUsersRoute extends AdminRoute {
-  model() {
-    return RSVP.hash({
-      lockedUsers: this.store.query("user-human", {
-        admin: true,
-        locked: true
-      }),
-      unlockedUsers: this.store.query("user-human", {
-        admin: true,
-        locked: false
-      })
+  model(params) {
+    // const locked = Boolean(params["locked"]);
+    return this.store.query("user-human", {
+      admin: true,
+      locked: false
+    }).then((entries) => {
+      return entries.sortBy("username");
     });
   }
 }
diff --git a/frontend/app/templates/admin/users.hbs b/frontend/app/templates/admin/users.hbs
index 3cd520d60..09378fd6c 100644
--- a/frontend/app/templates/admin/users.hbs
+++ b/frontend/app/templates/admin/users.hbs
@@ -1 +1 @@
-<Admin::Users @unlockedUsers={{@model.unlockedUsers}} @lockedUsers={{@model.lockedUsers}}></Admin::Users>
\ No newline at end of file
+<Admin::Users @users={{@model}} ></Admin::Users>
diff --git a/frontend/app/templates/components/admin/user/table.hbs b/frontend/app/templates/components/admin/user/table.hbs
index 9f59da2b9..ff510fb88 100644
--- a/frontend/app/templates/components/admin/user/table.hbs
+++ b/frontend/app/templates/components/admin/user/table.hbs
@@ -41,7 +41,7 @@
     </tr>
   </thead>
   <tbody>
-    {{#each this.users as |user|}}
+    {{#each @users as |user|}}
       <Admin::User::TableRow @user={{user}} @onRemove={{this.removeUser}} />
     {{/each}}
   </tbody>
diff --git a/frontend/app/templates/components/admin/users.hbs b/frontend/app/templates/components/admin/users.hbs
index f5d45965c..d3443c15e 100644
--- a/frontend/app/templates/components/admin/users.hbs
+++ b/frontend/app/templates/components/admin/users.hbs
@@ -1,7 +1,7 @@
 {{#if this.isUserNew}}
   <Admin::User::Form @onAbort={{this.toggleUserNew}} @onSuccess={{this.addUser}} @title={{t "admin.users.new.title"}} />
 {{/if}}
-
+{{@model}}
 <div class="pt-3">
   <div class="users-table-header">
     <h1>
@@ -16,17 +16,5 @@
     {{/if}}
   </div>
 
-  {{#if @lockedUsers}}
-    <BsTab as |tab|>
-      <tab.pane id="unlocked" @title={{t "admin.users.index.unlocked"}}>
-        <Admin::User::Table @users={{this.unlockedUsers}} />
-      </tab.pane>
-
-      <tab.pane id="locked" @title={{t "admin.users.index.locked"}}>
-        <Admin::User::Table @users={{@lockedUsers}} />
-      </tab.pane>
-    </BsTab>
-  {{else}}
-    <Admin::User::Table @users={{this.unlockedUsers}} />
-  {{/if}}
+  <Admin::User::Table @users={{@users}} />
 </div>
diff --git a/frontend/app/templates/teams/index.hbs b/frontend/app/templates/teams/index.hbs
index 32f5c3678..4f178bc72 100644
--- a/frontend/app/templates/teams/index.hbs
+++ b/frontend/app/templates/teams/index.hbs
@@ -4,7 +4,7 @@
       <SearchResultComponent @q={{q}}/>
     {{/if}}
     {{#if @model}}
-      {{#each this.model as |team|}}
+      {{#each @model as |team|}}
         <Team::Show @team={{team}} />
       {{/each}}
     {{else}}