diff --git a/adminui/registration.go b/adminui/registration.go
index efa44077..08b5d72c 100644
--- a/adminui/registration.go
+++ b/adminui/registration.go
@@ -6,6 +6,8 @@ import (
 	"log"
 	"net/http"
 	"strings"
+
+	"github.com/NHAS/wag/pkg/control"
 )
 
 func (au *AdminUI) getAllRegistrationTokens(w http.ResponseWriter, r *http.Request) {
@@ -34,11 +36,13 @@ func (au *AdminUI) getAllRegistrationTokens(w http.ResponseWriter, r *http.Reque
 
 func (au *AdminUI) createRegistrationToken(w http.ResponseWriter, r *http.Request) {
 	var (
-		req RegistrationTokenRequestDTO
-		err error
+		req        RegistrationTokenRequestDTO
+		res        control.RegistrationResult
+		err        error
+		successMsg string
 	)
 
-	defer func() { au.respond(err, w) }()
+	defer func() { au.respondSuccess(err, successMsg, w) }()
 	defer r.Body.Close()
 	err = json.NewDecoder(r.Body).Decode(&req)
 	if err != nil {
@@ -55,13 +59,14 @@ func (au *AdminUI) createRegistrationToken(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	_, err = au.ctrl.NewRegistration(req.Token, req.Username, req.Overwrites, req.Uses, req.Groups...)
+	res, err = au.ctrl.NewRegistration(req.Token, req.Username, req.Overwrites, req.Uses, req.Groups...)
 	if err != nil {
 		log.Println("unable to create new registration token: ", err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
+	successMsg = res.Token
 }
 
 func (au *AdminUI) deleteRegistrationTokens(w http.ResponseWriter, r *http.Request) {
diff --git a/adminui/users.go b/adminui/users.go
index fae9ebe0..c602c207 100644
--- a/adminui/users.go
+++ b/adminui/users.go
@@ -84,7 +84,6 @@ func (au *AdminUI) editUser(w http.ResponseWriter, r *http.Request) {
 	err = errors.Join(errs...)
 
 	if err != nil {
-
 		w.WriteHeader(http.StatusInternalServerError)
 		err = fmt.Errorf("%d/%d failed to %s\n%s", len(errs), len(action.Usernames), action.Action, errors.Join(errs...).Error())
 		return
diff --git a/adminui2/src/api/types.ts b/adminui2/src/api/types.ts
index 8df90b43..91ceb7c7 100644
--- a/adminui2/src/api/types.ts
+++ b/adminui2/src/api/types.ts
@@ -34,10 +34,24 @@ export interface UserDTO {
   mfa_type: string
   groups: string[]
 }
+
+
 export interface UsersGetAllResponseDTO {
   users: UserDTO[]
 }
 
+export enum UserEditActions {
+  Lock = "lock",
+  Unlock = "unlock",
+  RestMFA = "resetMFA",
+}
+
+
+export interface EditUsersDTO {
+  action: UserEditActions
+  usernames: string[]
+}
+
 export interface GroupDTO {
   group: string
   members: string[]
diff --git a/adminui2/src/api/users.ts b/adminui2/src/api/users.ts
index 5a0a60f6..1c694499 100644
--- a/adminui2/src/api/users.ts
+++ b/adminui2/src/api/users.ts
@@ -1,7 +1,15 @@
-import type { UserDTO } from './types'
+import type { GenericResponseDTO, UserDTO, EditUsersDTO } from './types'
 
 import { client } from '.'
 
 export function getAllUsers(): Promise<UserDTO[]> {
   return client.get('/api/management/users').then(res => res.data)
 }
+
+export function deleteUsers(users: string[]): Promise<GenericResponseDTO> {
+  return client.delete('/api/management/users', {data: users}).then(res => res.data)
+}
+
+export function editUser(edit: EditUsersDTO): Promise<GenericResponseDTO> {
+  return client.put('/api/management/users', edit).then(res => res.data)
+}
diff --git a/adminui2/src/layouts/default.vue b/adminui2/src/layouts/default.vue
index 4a8dd04a..0756ecbc 100644
--- a/adminui2/src/layouts/default.vue
+++ b/adminui2/src/layouts/default.vue
@@ -31,7 +31,7 @@ const policyLinks = [
 
 const managementLinks = [
   { name: 'Registration Tokens', icon: Icons.RegistrationKey, to: '/management/registration_tokens' },
-  { name: 'Users', icon: Icons.Groups, to: '/admin/users' },
+  { name: 'Users', icon: Icons.Groups, to: '/management/users' },
   { name: 'Devices', icon: Icons.Device, to: '/admin/users' }
 ]
 
diff --git a/adminui2/src/pages/RegistrationTokens.vue b/adminui2/src/pages/RegistrationTokens.vue
index 53643db4..1d85302b 100644
--- a/adminui2/src/pages/RegistrationTokens.vue
+++ b/adminui2/src/pages/RegistrationTokens.vue
@@ -65,9 +65,10 @@ async function deleteToken(token: RegistrationTokenRequestDTO) {
 </script>
 
 <template>
-  <RegistrationToken v-model:isOpen="isCreateTokenModalOpen" v-on:success="() => {tokensStore.load(true)}"></RegistrationToken>
 
   <main class="w-full p-4">
+    <RegistrationToken v-model:isOpen="isCreateTokenModalOpen" v-on:success="() => {tokensStore.load(true)}"></RegistrationToken>
+
 
     <h1 class="text-4xl font-bold">Registration Tokens</h1>
     <div class="mt-6 flex flex-wrap gap-6">
diff --git a/adminui2/src/pages/Users.vue b/adminui2/src/pages/Users.vue
index 9ce99fb4..38726496 100644
--- a/adminui2/src/pages/Users.vue
+++ b/adminui2/src/pages/Users.vue
@@ -1,17 +1,171 @@
 <script setup lang="ts">
-import UsersTable from '@/components/Admin/UsersTable.vue'
+import { computed, ref } from 'vue'
+import { useToast } from 'vue-toastification'
+import PaginationControls from '@/components/PaginationControls.vue'
+
+import { usePagination } from '@/composables/usePagination'
+import { useToastError } from '@/composables/useToastError'
+
+import { Icons } from '@/util/icons'
+
+import ConfirmModal from '@/components/ConfirmModal.vue'
+
+import { deleteUsers, editUser, UserEditActions, type EditUsersDTO } from '@/api'
+
+import { useUsersStore } from '@/stores/users'
+import RegistrationToken from '@/components/RegistrationToken.vue'
+
+const usersStore = useUsersStore()
+usersStore.load(false)
+
+
+const filterText = ref('')
+
+const allUsers = computed(() => usersStore.users ?? [])
+
+const filteredUsers = computed(() => {
+  const arr = allUsers.value
+
+  if (filterText.value == '') {
+    return arr
+  }
+
+  const searchTerm = filterText.value.trim().toLowerCase()
+
+  return arr.filter(
+    x =>
+      x.username.toLowerCase().includes(searchTerm) ||
+      x.groups?.includes(searchTerm) ||
+      x.mfa_type?.includes(searchTerm)
+  )
+})
+
+const { next: nextPage, prev: prevPage, totalPages, currentItems: currentUsers, activePage } = usePagination(filteredUsers, 20)
+
+const toast = useToast()
+const { catcher } = useToastError()
+
+async function updateUser(usernames: string[], action: UserEditActions) {
+  try {
+    let data: EditUsersDTO = {
+      action: action,
+      usernames: usernames
+    }
+
+    const resp = await editUser(data)
+   
+    usersStore.load(true)
+
+    if (!resp.success) {
+      toast.error(resp.message ?? 'Failed')
+      return
+    } else {
+      toast.success('users ' + usernames.join(", ") + ' edited!')
+    }
+  } catch (e) {
+    catcher(e, 'failed to edit users: ')
+  }
+}
+
+async function tryDeleteUsers(rules: string[] ) {
+  try {
+
+    const resp = await deleteUsers(rules)
+    usersStore.load(true)
+
+    if (!resp.success) {
+      toast.error(resp.message ?? 'Failed')
+      return
+    } else {
+      toast.success('user ' + rules.join(", ") + ' deleted!')
+    }
+  } catch (e) {
+    catcher(e, 'failed to delete user: ')
+  }
+}
+
+const isCreateTokenModalOpen = ref(false)
+
 </script>
 
 <template>
+
   <main class="w-full p-4">
-    <h1 class="text-4xl font-bold">User Management</h1>
+    <RegistrationToken v-model:isOpen="isCreateTokenModalOpen"></RegistrationToken>
 
-    <div class="mt-6 flex flex-wrap gap-6">
-      <div class="card w-full bg-base-100 shadow-xl">
-        <div class="card-body">
-          <UsersTable />
+    <h1 class="text-4xl font-bold">Users</h1>
+      <div class="mt-6 flex flex-wrap gap-6">
+        <div class="card w-full bg-base-100 shadow-xl min-w-[800px]">
+          <div class="card-body">
+            <div class="flex flex-row justify-between">
+              <div class="tooltip" data-tip="Create Registration Token">
+                <button class="btn btn-ghost btn-primary" @click="isCreateTokenModalOpen = true">Add User <font-awesome-icon
+                    :icon="Icons.Add" /></button>
+              </div>
+              <div class="form-control">
+                <label class="label">
+                  <input type="text" class="input input-bordered input-sm" placeholder="Filter..."
+                    v-model="filterText" />
+                </label>
+              </div>
+            </div>
+
+            <table class="table table-fixed w-full">
+              <thead>
+                <tr>
+                  <th>Username</th>
+                  <th>Groups</th>
+                  <th>Devices</th>
+                  <th>MFA Method</th>
+                  <th>Locked</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr class="hover group" v-for="user in currentUsers" :key="user.username">
+                  <td class="font-mono">
+                    <div class="overflow-hidden text-ellipsis whitespace-nowrap">{{ user.username }}</div>
+                  </td>
+                  <td class="font-mono">
+                    <div class="overflow-hidden text-ellipsis whitespace-nowrap">{{ user.groups?.join(", ") }}</div>
+                  </td>
+                  <td class="font-mono">
+                    <div class="overflow-hidden text-ellipsis whitespace-nowrap">{{ user.devices }}</div>
+                  </td>
+                  <td class="font-mono">
+                    <div class="overflow-hidden text-ellipsis whitespace-nowrap">{{ user.mfa_type }}</div>
+                  </td>
+                  <td class="font-mono relative">
+                    <div><font-awesome-icon class="cursor-pointer" @click="updateUser([user.username], (user.locked) ? UserEditActions.Unlock : UserEditActions.Lock)" :icon="user.locked ? Icons.Locked : Icons.Unlocked" :class="user.locked ? 'text-error' : 'text-secondary'"  /></div>
+                    <div v-if="user.mfa_type != 'unset'" class="mr-3 absolute right-4 top-1/2 -translate-y-1/2 opacity-0 group-hover:opacity-100 transition-opacity duration-200">
+                      <div class="tooltip" data-tip="Reset MFA">
+                        <button class="mr-3" @click="updateUser([user.username], UserEditActions.Lock)">
+                          <font-awesome-icon :icon="Icons.Refresh" class="text-secondary hover:text-secondary-focus" />
+                        </button>
+                      </div>
+                    </div>
+                    <ConfirmModal @on-confirm="() => tryDeleteUsers([user.username])">
+                      <button class="absolute right-4 top-1/2 -translate-y-1/2 opacity-0 group-hover:opacity-100 transition-opacity duration-200">
+                        <font-awesome-icon :icon="Icons.Delete" class="text-error hover:text-error-focus" />
+                      </button>
+                    </ConfirmModal>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+
+            <div class="mt-2 w-full text-center">
+              <PaginationControls @next="() => nextPage()" @prev="() => prevPage()" :current-page="activePage"
+                :total-pages="totalPages" />
+            </div>
+          </div>
         </div>
-      </div>
     </div>
   </main>
 </template>
+
+<style scoped>
+.hashlist-table.table-sm :where(th, td) {
+  padding-top: 0.4rem;
+  padding-bottom: 0.4rem;
+}
+</style>
diff --git a/adminui2/src/router/index.ts b/adminui2/src/router/index.ts
index b5a7950a..751a9a1a 100644
--- a/adminui2/src/router/index.ts
+++ b/adminui2/src/router/index.ts
@@ -49,7 +49,7 @@ const router = createRouter({
     // route('/diagnostics/check', 'Check Firewall', () => import('@/pages/projects/project.vue')),
     // route('/diagnostics/acls', 'ACLs', () => import('@/pages/projects/project.vue')),
 
-    // route('/management/users', 'User Management', () => import('@/pages/Hashlist.vue')),
+    route('/management/users', 'User Management', () => import('@/pages/Users.vue')),
     // route('/management/devices', 'Device Management', () => import('@/pages/Hashlist.vue')),
     route('/management/registration_tokens', 'Registration Tokens', () => import('@/pages/RegistrationTokens.vue')),
 
diff --git a/adminui2/src/util/icons.ts b/adminui2/src/util/icons.ts
index b698b7e2..98e85795 100644
--- a/adminui2/src/util/icons.ts
+++ b/adminui2/src/util/icons.ts
@@ -13,13 +13,14 @@ export const Icons = {
   Add: 'fa-solid fa-plus-circle',
   Info: 'fa-solid fa-circle-info',
   Clipboard: 'fa-solid fa-clipboard',
+  Refresh: 'fa-solid fa-refresh',
 
   // objects
   Agent: 'fa-solid fa-robot',
   User: 'fa-solid fa-user',
   RegistrationKey: 'fa-solid fa-key',
 
-  Open: 'fa-folid fa-bars',
+  Open: 'fa-solid fa-bars',
 
   Listfile: 'fa-solid fa-file-lines',
 
@@ -55,6 +56,8 @@ export const Icons = {
   RandomlyGenerated: 'fa-solid fa-dice',
   Tick: 'fa-solid fa-check',
   Locked: 'fa-solid fa-lock',
+  Unlocked: 'fa-solid fa-unlock',
+
   Awaiting: 'fa-solid fa-hourglass-end',
   Dead: 'fa-solid fa-skull-crossbones',
   Unknown: 'fa-solid fa-question'