diff --git a/frontend/src/api/dtos/UserListResponse.ts b/frontend/src/api/dtos/UserListResponse.ts
new file mode 100644
index 0000000..ed6b669
--- /dev/null
+++ b/frontend/src/api/dtos/UserListResponse.ts
@@ -0,0 +1,8 @@
+import {UserDto} from "./UserDto.js";
+
+/**
+ * API response for delivering a list of users
+ */
+export class UserListResponse {
+    valueList: UserDto[] = [];
+}
\ No newline at end of file
diff --git a/frontend/src/api/points/UserPoint.ts b/frontend/src/api/points/UserPoint.ts
index 0614c2a..02d0695 100644
--- a/frontend/src/api/points/UserPoint.ts
+++ b/frontend/src/api/points/UserPoint.ts
@@ -3,13 +3,14 @@ import type {UserDto} from "../dtos/UserDto";
 import type {CreateUserRequest} from "../dtos/CreateUserRequest.ts";
 import type {ChangeUserPasswordRequest} from "../dtos/ChangeUserPasswordRequest.ts";
 import type {CreateUserResponse} from "../dtos/CreateUserResponse.ts";
+import type {UserListResponse} from "../dtos/UserListResponse.ts";
 
 export async function fetchCurrentUser(): Promise<UserDto> {
     return apiClient.get("/user/me");
 }
 
-export async function fetchAllUsers(): Promise<UserDto[]> {
-    return apiClient.get("/user/list");
+export async function fetchAllUsers(): Promise<UserListResponse> {
+    return apiClient.get("/user/all");
 }
 
 export async function createUser(dto: CreateUserRequest): Promise<CreateUserResponse> {
diff --git a/frontend/src/components/recipes/IngredientGroupListEditor.tsx b/frontend/src/components/recipes/IngredientGroupListEditor.tsx
index ddbfb06..6cf42af 100644
--- a/frontend/src/components/recipes/IngredientGroupListEditor.tsx
+++ b/frontend/src/components/recipes/IngredientGroupListEditor.tsx
@@ -50,6 +50,7 @@ export function IngredientGroupListEditor({ingredientGroupList, onChange}: Ingre
                 {ingredientGroupList.map((ingGrp, index) => (
                     <IngredientGroupEditorListItem
                         index={index}
+                        key={index}
                         ingredientGroupModel={ingGrp}
                         handleUpdate={handleUpdate}
                         handleRemove={handleRemove}
diff --git a/frontend/src/components/users/UserManagementPage.tsx b/frontend/src/components/users/UserManagementPage.tsx
index 1355214..3bac1aa 100644
--- a/frontend/src/components/users/UserManagementPage.tsx
+++ b/frontend/src/components/users/UserManagementPage.tsx
@@ -1,5 +1,5 @@
 import {useEffect, useState} from "react";
-import {createUser, fetchCurrentUser, updateUser} from "../../api/points/UserPoint";
+import {createUser, fetchAllUsers, fetchCurrentUser, updateUser} from "../../api/points/UserPoint";
 import type {UserDto} from "../../api/dtos/UserDto.ts";
 import ContentBackground from "../basics/ContentBackground";
 import ContentBody from "../basics/ContentBody";
@@ -17,6 +17,7 @@ import {getRecipeListUrl} from "../../routes.ts";
 import TextLinkButton from "../basics/TextLinkButton.tsx";
 import SelectField from "../basics/SelectField.tsx";
 import type {CreateUserResponse} from "../../api/dtos/CreateUserResponse.ts";
+import type {UserListResponse} from "../../api/dtos/UserListResponse.ts";
 
 /**
  * UserManagementPage
@@ -50,13 +51,14 @@ export default function UserManagementPage() {
         const me = await fetchCurrentUser();
         setCurrentUser(me);
 
-        //if (me.role === "admin") {
-        //    const allUsers = await fetchAllUsers();
-        //    setUsers(allUsers);
-        //} else {
-        setUsers([me]);
-        setSelectedUser(me);
-        //}
+        if (me.role === "admin") {
+            const userResponse: UserListResponse = await fetchAllUsers();
+            setUsers(userResponse.valueList);
+            console.log(users)
+        } else {
+            setUsers([me]);
+            setSelectedUser(me);
+        }
     };
 
     /** Handles selecting a user from the list */