diff --git a/client/src/Pages/Account/EditUser/index.tsx b/client/src/Pages/Account/EditUser/index.tsx
new file mode 100644
index 000000000..cd06581ed
--- /dev/null
+++ b/client/src/Pages/Account/EditUser/index.tsx
@@ -0,0 +1,83 @@
+import { Stack, MenuItem } from "@mui/material";
+import { useTheme } from "@mui/material";
+import { useTranslation } from "react-i18next";
+import { ConfigBox, BasePage, Breadcrumb } from "@/Components/v2/design-elements";
+import { TextField, Button, Select } from "@/Components/v2/inputs";
+import { UserRoles } from "@/Types/User";
+import { useState } from "react";
+
+const EditUserPage = () => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+
+	const [firstName, setFirstName] = useState("");
+	const [lastName, setLastName] = useState("");
+	const [email] = useState("");
+	const [roles, setRoles] = useState<string[]>([]);
+
+	const editableRoles = UserRoles.filter((role) => role !== "superadmin");
+
+	return (
+		<BasePage>
+			<Breadcrumb breadcrumbOverride={[t("menu.team"), t("editUserPage.title")]} />
+			<Stack gap={theme.spacing(8)}>
+				<ConfigBox
+					title={t("pages.account.form.name.title")}
+					subtitle={t("pages.account.form.name.description")}
+					rightContent={
+						<Stack gap={theme.spacing(8)}>
+							<TextField
+								fieldLabel={t("editUserPage.form.firstName")}
+								value={firstName}
+								onChange={(e) => setFirstName(e.target.value)}
+								autoComplete="given-name"
+							/>
+							<TextField
+								fieldLabel={t("editUserPage.form.lastName")}
+								value={lastName}
+								onChange={(e) => setLastName(e.target.value)}
+								autoComplete="family-name"
+							/>
+							<TextField
+								fieldLabel={t("editUserPage.form.email")}
+								value={email}
+								disabled
+							/>
+						</Stack>
+					}
+				/>
+				<ConfigBox
+					title={t("editUserPage.form.role")}
+					subtitle={t("pages.account.team.invite.role.placeholder")}
+					rightContent={
+						<Select
+							multiple
+							value={roles}
+							onChange={(e) => setRoles(e.target.value as string[])}
+							placeholder={t("pages.account.team.invite.role.placeholder")}
+							sx={{ minWidth: 200 }}
+						>
+							{editableRoles.map((role) => (
+								<MenuItem
+									key={role}
+									value={role}
+								>
+									{t(`common.auth.roles.${role}`)}
+								</MenuItem>
+							))}
+						</Select>
+					}
+				/>
+				<Button
+					variant="contained"
+					color="primary"
+					sx={{ alignSelf: "flex-end", minWidth: 100 }}
+				>
+					{t("common.buttons.save")}
+				</Button>
+			</Stack>
+		</BasePage>
+	);
+};
+
+export default EditUserPage;
diff --git a/client/src/Pages/Account/EditUser/index.jsx b/client/src/Pages/Account/EditUser/old.jsx
similarity index 100%
rename from client/src/Pages/Account/EditUser/index.jsx
rename to client/src/Pages/Account/EditUser/old.jsx
diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index 282a5db56..4c68c0367 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -46,7 +46,7 @@ import CreateNotifications from "../Pages/Notifications/create";
 
 // Settings
 import Account from "@/Pages/Account";
-import EditUser from "../Pages/Account/EditUser/index.jsx";
+import EditUser from "../Pages/Account/EditUser";
 import Settings from "../Pages/Settings";
 
 import Maintenance from "../Pages/Maintenance";
@@ -354,7 +354,9 @@ const Routes = () => {
 					path="account/team/:userId"
 					element={
 						<RoleProtectedRoute roles={["superadmin"]}>
-							<EditUser />
+							<ThemeProvider theme={v2theme}>
+								<EditUser />
+							</ThemeProvider>
 						</RoleProtectedRoute>
 					}
 				/>