diff --git a/packages/web/src/pages/ProfileSettings/index.tsx b/packages/web/src/pages/ProfileSettings/index.tsx
index 7729e9f2..6935b00f 100644
--- a/packages/web/src/pages/ProfileSettings/index.tsx
+++ b/packages/web/src/pages/ProfileSettings/index.tsx
@@ -92,14 +92,14 @@ function ProfileSettings() {
resolver={yupResolver(emailValidationSchema)}
mode="onChange"
sx={{ mb: 2 }}
- render={({ formState: { errors, isDirty, isValid, isSubmitting } }) => (
+ render={({ formState: { errors, touchedFields, isDirty, isValid, isSubmitting } }) => (
<>
@@ -119,7 +119,7 @@ function ProfileSettings() {
onSubmit={handlePasswordUpdate}
resolver={yupResolver(passwordValidationSchema)}
mode="onChange"
- render={({ formState: { errors, isDirty, isValid, isSubmitting } }) => (
+ render={({ formState: { errors, touchedFields, isDirty, isValid, isSubmitting } }) => (
<>
@@ -137,7 +137,7 @@ function ProfileSettings() {
label={formatMessage('profileSettings.confirmNewPassword')}
margin="normal"
type="password"
- error={!!errors?.confirmPassword}
+ error={touchedFields.confirmPassword && !!errors?.confirmPassword}
helperText={errors?.confirmPassword?.message || ' '}
/>