diff --git a/client/src/Pages/Account/TabPassword.tsx b/client/src/Pages/Account/TabPassword.tsx
index cd07410ac..cdf7ce4c4 100644
--- a/client/src/Pages/Account/TabPassword.tsx
+++ b/client/src/Pages/Account/TabPassword.tsx
@@ -1,24 +1,51 @@
 import { Stack } from "@mui/material";
 import { ConfigBox } from "@/Components/v2/design-elements";
-import { TextField } from "@/Components/v2/inputs";
+import { TextField, Button } from "@/Components/v2/inputs";
 
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@mui/material";
+import { useForm, Controller } from "react-hook-form";
+import { usePasswordForm } from "@/Hooks/usePasswordForm";
+import type { PasswordFormData } from "@/Validation/password";
 
 export const TabPassword = () => {
 	const { t } = useTranslation();
 	const theme = useTheme();
+	const { resolver, defaults } = usePasswordForm();
+
+	const { control, handleSubmit } = useForm<PasswordFormData>({
+		resolver,
+		defaultValues: defaults,
+	});
+
+	const onSubmit = (data: PasswordFormData) => {
+		console.log("Password form data:", data);
+	};
 
 	return (
-		<Stack gap={theme.spacing(8)}>
+		<Stack
+			gap={theme.spacing(8)}
+			component="form"
+			onSubmit={handleSubmit(onSubmit)}
+		>
 			<ConfigBox
 				title={t("pages.account.form.currentPassword.title")}
 				subtitle={t("pages.account.form.currentPassword.description")}
 				rightContent={
-					<TextField
-						type="password"
-						fieldLabel={t("pages.account.form.currentPassword.option.label")}
-						placeholder={t("pages.account.form.currentPassword.option.placeholder")}
+					<Controller
+						name="currentPassword"
+						control={control}
+						render={({ field, fieldState }) => (
+							<TextField
+								{...field}
+								type="password"
+								fieldLabel={t("pages.account.form.currentPassword.option.label")}
+								placeholder={t("pages.account.form.currentPassword.option.placeholder")}
+								autoComplete="current-password"
+								error={!!fieldState.error}
+								helperText={fieldState.error?.message ?? ""}
+							/>
+						)}
 					/>
 				}
 			/>
@@ -27,21 +54,53 @@ export const TabPassword = () => {
 				subtitle={t("pages.account.form.newPassword.description")}
 				rightContent={
 					<Stack gap={theme.spacing(8)}>
-						<TextField
-							type="password"
-							fieldLabel={t("pages.account.form.newPassword.option.newPassword.label")}
-							placeholder={t(
-								"pages.account.form.newPassword.option.newPassword.placeholder"
+						<Controller
+							name="newPassword"
+							control={control}
+							render={({ field, fieldState }) => (
+								<TextField
+									{...field}
+									type="password"
+									fieldLabel={t(
+										"pages.account.form.newPassword.option.newPassword.label"
+									)}
+									placeholder={t(
+										"pages.account.form.newPassword.option.newPassword.placeholder"
+									)}
+									autoComplete="new-password"
+									error={!!fieldState.error}
+									helperText={fieldState.error?.message ?? ""}
+								/>
 							)}
 						/>
-						<TextField
-							type="password"
-							fieldLabel={t("pages.account.form.newPassword.option.confirm.label")}
-							placeholder={t("pages.account.form.newPassword.option.confirm.placeholder")}
+						<Controller
+							name="confirm"
+							control={control}
+							render={({ field, fieldState }) => (
+								<TextField
+									{...field}
+									type="password"
+									fieldLabel={t("pages.account.form.newPassword.option.confirm.label")}
+									placeholder={t(
+										"pages.account.form.newPassword.option.confirm.placeholder"
+									)}
+									autoComplete="new-password"
+									error={!!fieldState.error}
+									helperText={fieldState.error?.message ?? ""}
+								/>
+							)}
 						/>
 					</Stack>
 				}
 			/>
+			<Button
+				type="submit"
+				variant="contained"
+				color="primary"
+				sx={{ alignSelf: "flex-end", minWidth: 100 }}
+			>
+				{t("common.buttons.save")}
+			</Button>
 		</Stack>
 	);
 };