diff --git a/frontend/src/components/topbar.tsx b/frontend/src/components/topbar.tsx
index 29f42e3cc..e3ad234b6 100644
--- a/frontend/src/components/topbar.tsx
+++ b/frontend/src/components/topbar.tsx
@@ -288,7 +288,7 @@ const UsersDropdown = ({ user_id }: { user_id: string | undefined }) => {
   const [open, setOpen] = useState(false);
   const [input, setInput] = useState("");
 
-  const users = useRead("GetUsers", {}).data;
+  const users = useRead("ListUsers", {}).data;
 
   const selected = user_id
     ? users?.find((user) => user._id?.$oid === user_id)
diff --git a/frontend/src/pages/users.tsx b/frontend/src/pages/users.tsx
index 6e0d9a349..4d8186afc 100644
--- a/frontend/src/pages/users.tsx
+++ b/frontend/src/pages/users.tsx
@@ -27,8 +27,9 @@ export const UsersPage = () => {
   useSetTitle("Users");
   const nav = useNavigate();
   const groups = useRead("ListUserGroups", {}).data;
-  const users = useRead("GetUsers", {}).data;
+  const users = useRead("ListUsers", {}).data;
   const [search, setSearch] = useState("");
+  const searchSplit = search.split(" ");
   return (
     <Page
       actions={
@@ -40,10 +41,35 @@ export const UsersPage = () => {
         />
       }
     >
+      {/* User Groups */}
+      <Section title="User Groups">
+        <DataTable
+          tableKey="user-groups"
+          data={
+            groups?.filter((group) =>
+              searchSplit.every((term) => group.name.includes(term))
+            ) ?? []
+          }
+          columns={[
+            { header: "Name", accessorKey: "name" },
+            {
+              header: "Members",
+              accessorFn: (group) => group.users.length,
+            },
+          ]}
+          onRowClick={(group) => nav(`/user-groups/${group._id!.$oid}`)}
+        />
+      </Section>
+
+      {/* Users */}
       <Section title="Users">
         <DataTable
           tableKey="users"
-          data={users ?? []}
+          data={
+            users?.filter((user) =>
+              searchSplit.every((term) => user.username.includes(term))
+            ) ?? []
+          }
           columns={[
             { header: "Username", accessorKey: "username" },
             { header: "Type", accessorKey: "config.type" },
@@ -76,11 +102,11 @@ export const UserPage = () => {
   const { toast } = useToast();
   const inv = useInvalidate();
   const user_id = useParams().id as string;
-  const user = useRead("GetUsers", {}).data?.find(
+  const user = useRead("ListUsers", {}).data?.find(
     (user) => user._id?.$oid === user_id
   );
   const { mutate } = useWrite("UpdateUserBasePermissions", {
-    onSuccess: () => inv(["GetUsers"]),
+    onSuccess: () => inv(["ListUsers"]),
     onError: (e) => {
       console.log(e);
       toast({ title: "Failed to update user permissions" });