diff --git a/components/Forms/Edit/Profile/FormContent/index.tsx b/components/Forms/Edit/Profile/FormContent/index.tsx
index a4c86f225..3792cc85d 100644
--- a/components/Forms/Edit/Profile/FormContent/index.tsx
+++ b/components/Forms/Edit/Profile/FormContent/index.tsx
@@ -24,7 +24,7 @@ export default function FormContent() {
   const email = `${intl.formatMessage({ id: "Email" })} ${intl.formatMessage({ id: "Address" }).toLowerCase()}`
   const street = intl.formatMessage({ id: "Address" })
   const phoneNumber = intl.formatMessage({ id: "Phone number" })
-  const password = intl.formatMessage({ id: "Current password" })
+  const currentPassword = intl.formatMessage({ id: "Current password" })
   const retypeNewPassword = intl.formatMessage({ id: "Retype new password" })
   const zipCode = intl.formatMessage({ id: "Zip code" })
 
@@ -72,7 +72,7 @@ export default function FormContent() {
             {intl.formatMessage({ id: "Password" })}
           </Body>
         </header>
-        <Input label={password} name="password" type="password" />
+        <Input label={currentPassword} name="password" type="password" />
         <NewPassword />
         <Input
           label={retypeNewPassword}
diff --git a/components/Forms/Edit/Profile/schema.ts b/components/Forms/Edit/Profile/schema.ts
index bf4e374cc..681a67240 100644
--- a/components/Forms/Edit/Profile/schema.ts
+++ b/components/Forms/Edit/Profile/schema.ts
@@ -26,7 +26,7 @@ export const editProfileSchema = z
     ),
 
     password: z.string().optional(),
-    newPassword: passwordValidator(),
+    newPassword: z.literal("").or(passwordValidator()),
     retypeNewPassword: z.string().optional(),
   })
   .superRefine((data, ctx) => {