diff --git a/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs
index 0ca7d11638ba..64d0d582f8a7 100644
--- a/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs
+++ b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs
@@ -70,7 +70,7 @@ export const PasswordResetFinishPage = () => {
           touchedFields={ touchedFields }
           errors={ errors }
           setValue={ setValue }
-          name="newPassword"
+          nameIdCy="newPassword"
           validate={{
             required: translate('global.messages.validate.newpassword.required') ,
             minLength: { value: 4, message: translate('global.messages.validate.newpassword.minlength') },
@@ -87,7 +87,7 @@ export const PasswordResetFinishPage = () => {
           touchedFields={ touchedFields }
           errors={ errors }
           setValue={ setValue }
-          name="confirmPassword"
+          nameIdCy="confirmPassword"
           validate={{
             required: translate('global.messages.validate.confirmpassword.required'),
             minLength: { value: 4, message: translate('global.messages.validate.confirmpassword.minlength') },
diff --git a/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs
index aa15c272647b..6c2dc63d23ad 100644
--- a/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs
+++ b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs
@@ -71,7 +71,7 @@ export const PasswordResetInit = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="email"
+              nameIdCy="email"
               validate={ {
                 required: translate('global.messages.validate.email.required'),
                 minLength: { value: 5, message: translate('global.messages.validate.email.minlength') },
diff --git a/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs
index 97775537fd44..812b8ab5eae3 100644
--- a/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs
+++ b/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs
@@ -80,7 +80,7 @@ export const PasswordPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="currentPassword"
+              nameIdCy="currentPassword"
               validate={{ required: translate('global.messages.validate.newpassword.required') }}
               labelPlaceholderKey="global.form.currentpassword.label"
               inputPlaceholderKey="global.form.currentpassword.placeholder"
@@ -91,7 +91,7 @@ export const PasswordPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="newPassword"
+              nameIdCy="newPassword"
               validate={{
                 required: translate('global.messages.validate.newpassword.required'),
                 minLength: { value: 4, message: translate('global.messages.validate.newpassword.minlength') },
@@ -108,7 +108,7 @@ export const PasswordPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="confirmPassword"
+              nameIdCy="confirmPassword"
               validate={{
                 required: translate('global.messages.validate.confirmpassword.required'),
                 minLength: { value: 4, message: translate('global.messages.validate.confirmpassword.minlength') },
diff --git a/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs
index 52c6281ef3c8..ef59b1c32e66 100644
--- a/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs
+++ b/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs
@@ -82,7 +82,7 @@ export const RegisterPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="username"
+              nameIdCy="username"
               validate={{
                 required: translate('register.messages.validate.login.required'),
                 pattern: {
@@ -100,7 +100,7 @@ export const RegisterPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="email"
+              nameIdCy="email"
               type="email"
               validate={{
                 required: translate('global.messages.validate.email.required'),
@@ -116,7 +116,7 @@ export const RegisterPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="firstPassword"
+              nameIdCy="firstPassword"
               type="password"
               validate={{
                 required: translate('global.messages.validate.newpassword.required'),
@@ -133,7 +133,7 @@ export const RegisterPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="secondPassword"
+              nameIdCy="secondPassword"
               type="password"
               validate={{
                 required: translate('global.messages.validate.confirmpassword.required'),
diff --git a/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs
index 25663caad599..ce9cf6d4f233 100644
--- a/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs
+++ b/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs
@@ -27,7 +27,7 @@ import { locales, languages } from 'app/config/translation';
 import { useAppDispatch, useAppSelector } from 'app/config/store';
 import { getSession } from 'app/shared/reducers/authentication';
 import { saveAccountSettings, reset } from './settings.reducer';
-import { useForm } from 'react-hook-form';
+import { DefaultValues, FieldValues, useForm } from 'react-hook-form';
 
 export const SettingsPage = () => {
   const dispatch = useAppDispatch();
@@ -38,7 +38,16 @@ export const SettingsPage = () => {
     handleSubmit,
     setValue,
     formState: { errors, touchedFields },
-  } = useForm();
+  } = useForm({
+      defaultValues: {
+        firstName: account?.firstName,
+        lastName: account?.lastName,
+        email: account?.email,
+<%_ if (enableTranslation) { _%>
+        langKey: account?.langKey,
+<%_ } _%>
+      } as DefaultValues<FieldValues>
+  });
 
   useEffect(() => {
     dispatch(getSession());
@@ -76,13 +85,13 @@ export const SettingsPage = () => {
             </Translate>
           </h2>
           {/* eslint-disable-next-line @typescript-eslint/no-misused-promises */}
-          <Form id="settings-form" onSubmit={handleSubmit(handleValidSubmit)} defaultValues={account}>
+          <Form id="settings-form" onSubmit={handleSubmit(handleValidSubmit)}>
             <ValidatedTextInput
               register={ register }
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="firstName"
+              nameIdCy="firstName"
               validate={{
                 required: translate('settings.messages.validate.firstname.required'),
                 minLength: { value: 1, message: translate('settings.messages.validate.firstname.minlength') },
@@ -96,7 +105,7 @@ export const SettingsPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="lastName"
+              nameIdCy="lastName"
               validate={{
                 required: translate('settings.messages.validate.lastname.required'),
                 minLength: { value: 1, message: translate('settings.messages.validate.lastname.minlength') },
@@ -110,7 +119,7 @@ export const SettingsPage = () => {
               touchedFields={ touchedFields }
               errors={ errors }
               setValue={ setValue }
-              name="email"
+              nameIdCy="email"
               type="email"
               validate={{
                 required: translate('global.messages.validate.email.required'),
diff --git a/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.ejs
index b5566c07171b..760caba1ba17 100644
--- a/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.ejs
+++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.ejs
@@ -16,11 +16,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import React, { useState, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import { Link, useNavigate, useParams } from 'react-router-dom';
-import { Button, Row, Col, FormText } from 'reactstrap';
-import { Translate, translate, ValidatedField, ValidatedForm, isEmail } from 'react-jhipster';
+import { Button, Row, Col, Form, Input } from 'reactstrap';
+import { Translate, translate, ValidatedTextInput, isEmail } from 'react-jhipster';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { useForm } from 'react-hook-form';
 
 <%_ if (enableTranslation) { _%>
 import { locales, languages } from 'app/config/translation';
@@ -66,6 +67,23 @@ export const UserManagementUpdate = () => {
   const loading = useAppSelector(state => state.userManagement.loading);
   const updating = useAppSelector(state => state.userManagement.updating);
   const authorities = useAppSelector(state => state.userManagement.authorities);
+  const {
+    register,
+    handleSubmit,
+    setValue,
+    formState: { errors, touchedFields },
+  } = useForm({
+        defaultValues: {
+          id: user?.id,
+          login: user?.login,
+          firstName: user?.firstName,
+          lastName: user?.lastName,
+          email: user?.email,
+          activated: user?.activated,
+          langKey: user?.langKey,
+          authorities: user?.authorities,
+        } as DefaultValues<FieldValues>
+    });
 
   return (
     <div>
@@ -79,108 +97,119 @@ export const UserManagementUpdate = () => {
       <Row className="justify-content-center">
         <Col md="8">
         { loading ? <p>Loading...</p>
-        : <ValidatedForm onSubmit={saveUser} defaultValues={user}>
+          /* eslint-disable-next-line @typescript-eslint/no-misused-promises */
+        : <Form onSubmit={handleSubmit(saveUser)}>
           {user.id ? (
-            <ValidatedField
-              type="text"
-              name="id"
-              required
+            <ValidatedTextInput
+              register={ register }
+              touchedFields={ touchedFields }
+              errors={ errors }
+              setValue={ setValue }
+              nameIdCy="id"
+              validate={{
+                required: true,
+              }}
               readOnly
-              label={translate('global.field.id')}
-              validate={{ required: true }}
+              labelPlaceholderKey="global.field.id"
+            />
+              ) : null}
+            <ValidatedTextInput
+              register={ register }
+              touchedFields={ touchedFields }
+              errors={ errors }
+              setValue={ setValue }
+              nameIdCy="login"
+              validate={{
+                required: translate('register.messages.validate.login.required'),
+                pattern: {
+                  value: /<%- LOGIN_REGEX %>/,
+                  message: translate('register.messages.validate.login.pattern'),
+                },
+                minLength: {
+                  value: 1,
+                  message: translate('register.messages.validate.login.minlength'),
+                },
+                maxLength: {
+                  value: 50,
+                  message: translate('register.messages.validate.login.maxlength'),
+                },
+              }}
+              labelPlaceholderKey="userManagement.login"
+            />
+            <ValidatedTextInput
+              register={ register }
+              touchedFields={ touchedFields }
+              errors={ errors }
+              setValue={ setValue }
+              nameIdCy="firstName"
+              validate={{
+                maxLength: {
+                  value: 50,
+                  message: translate('entity.validation.maxlength', { max: 50 }),
+                },
+              }}
+              labelPlaceholderKey="userManagement.firstName"
+            />
+            <ValidatedTextInput
+              register={ register }
+              touchedFields={ touchedFields }
+              errors={ errors }
+              setValue={ setValue }
+              nameIdCy="lastName"
+              validate={{
+                maxLength: {
+                  value: 50,
+                  message: translate('entity.validation.maxlength', { max: 50 }),
+                },
+              }}
+              labelPlaceholderKey="userManagement.lastName"
+            />
+            <ValidatedTextInput
+              register={ register }
+              touchedFields={ touchedFields }
+              errors={ errors }
+              setValue={ setValue }
+              nameIdCy="email"
+              type="email"
+              validate={{
+                required: translate('global.messages.validate.email.required'),
+                minLength: {
+                  value: 5,
+                  message: translate('global.messages.validate.email.minlength'),
+                },
+                maxLength: {
+                  value: 254,
+                  message: translate('global.messages.validate.email.maxlength'),
+                },
+                validate: v => isEmail(v) || translate('global.messages.validate.email.invalid'),
+              }}
+              labelPlaceholderKey="global.form.email.label"
+              inputPlaceholderKey="global.form.email.placeholder"
+            />
+            <Input
+              type="checkbox"
+              name="activated"
+              check
+              {...register('activated')}
+              disabled={!user.id}
+              label={translate('userManagement.activated')}
             />
-          ) : null}
-          <ValidatedField
-            type="text"
-            name="login"
-            label={translate('userManagement.login')}
-            validate={{
-              required: {
-                value: true,
-                message: translate('register.messages.validate.login.required'),
-              },
-              pattern: {
-                value: /<%- LOGIN_REGEX %>/,
-                message: translate('register.messages.validate.login.pattern'),
-              },
-              minLength: {
-                value: 1,
-                message: translate('register.messages.validate.login.minlength'),
-              },
-              maxLength: {
-                value: 50,
-                message: translate('register.messages.validate.login.maxlength'),
-              },
-            }}
-          />
-          <ValidatedField
-            type="text"
-            name="firstName"
-            label={translate('userManagement.firstName')}
-            validate={{
-              maxLength: {
-                value: 50,
-                message: translate('entity.validation.maxlength', { max: 50 }),
-              },
-            }}
-          />
-          <ValidatedField
-            type="text"
-            name="lastName"
-            label={translate('userManagement.lastName')}
-            validate={{
-              maxLength: {
-                value: 50,
-                message: translate('entity.validation.maxlength', { max: 50 }),
-              },
-            }}
-          />
-          <FormText>This field cannot be longer than 50 characters.</FormText>
-          <ValidatedField
-            name="email"
-            label={translate('global.form.email.label')}
-            placeholder={translate('global.form.email.placeholder')}
-            type="email"
-            validate={{
-              required: {
-                value: true,
-                message: translate('global.messages.validate.email.required'),
-              },
-              minLength: {
-                value: 5,
-                message: translate('global.messages.validate.email.minlength'),
-              },
-              maxLength: {
-                value: 254,
-                message: translate('global.messages.validate.email.maxlength'),
-              },
-              validate: v => isEmail(v) || translate('global.messages.validate.email.invalid'),
-            }}
-          />
-          <ValidatedField
-            type="checkbox"
-            name="activated"
-            check
-            value={true}
-            disabled={!user.id}
-            label={translate('userManagement.activated')}
-          />
 <%_ if (enableTranslation) { _%>
-          <ValidatedField type="select" name="langKey" label={translate('userManagement.langKey')}>
+          <Input type="select" name="langKey" label={translate('userManagement.langKey')}>
             {locales.map(locale => (
               <option value={locale} key={locale}>
                 {languages[locale].name}
               </option>
             ))}
-          </ValidatedField>
+          </Input>
 <%_ } _%>
-          <ValidatedField type="select" name="authorities" multiple label={translate('userManagement.profiles')}>
+          <Input type="select" name="authorities" multiple label={translate('userManagement.profiles')}>
             {authorities.map(role => (
               <option value={role} key={role}>
                 {role}
               </option>
             ))}
-          </ValidatedField>
+          </Input>
           <Button tag={Link} to="/admin/user-management" replace color="info">
             <FontAwesomeIcon icon="arrow-left" />&nbsp;
             <span className="d-none d-md-inline">
@@ -192,7 +221,7 @@ export const UserManagementUpdate = () => {
             <FontAwesomeIcon icon="save" />&nbsp;
             <Translate contentKey="entity.action.save">Save</Translate>
           </Button>
-        </ValidatedForm>
+        </Form>
         }
         </Col>
       </Row>