diff --git a/scm-ui/src/users/components/SetUserPassword.js b/scm-ui/src/users/components/SetUserPassword.js
index 19872cb9a2..ff859f59bf 100644
--- a/scm-ui/src/users/components/SetUserPassword.js
+++ b/scm-ui/src/users/components/SetUserPassword.js
@@ -19,7 +19,7 @@ type Props = {
 type State = {
   password: string,
   loading: boolean,
-  passwordValidationError: boolean,
+  passwordConfirmationError: boolean,
   validatePasswordError: boolean,
   validatePassword: string,
   error?: Error,
@@ -33,7 +33,7 @@ class SetUserPassword extends React.Component<Props, State> {
     this.state = {
       password: "",
       loading: false,
-      passwordValidationError: false,
+      passwordConfirmationError: false,
       validatePasswordError: false,
       validatePassword: "",
       passwordChanged: false
@@ -42,7 +42,7 @@ class SetUserPassword extends React.Component<Props, State> {
 
   passwordIsValid = () => {
     return !(
-      this.state.validatePasswordError || this.state.passwordValidationError
+      this.state.validatePasswordError || this.state.passwordConfirmationError
     );
   };
 
@@ -69,7 +69,7 @@ class SetUserPassword extends React.Component<Props, State> {
       password: "",
       validatePassword: "",
       validatePasswordError: false,
-      passwordValidationError: false
+      passwordConfirmationError: false
     });
   };
 
@@ -126,7 +126,7 @@ class SetUserPassword extends React.Component<Props, State> {
           type="password"
           onChange={this.handlePasswordValidationChange}
           value={this.state ? this.state.validatePassword : ""}
-          validationError={this.state.passwordValidationError}
+          validationError={this.state.passwordConfirmationError}
           errorMessage={t("validation.passwordValidation-invalid")}
           helpText={t("help.passwordConfirmHelpText")}
         />
@@ -146,19 +146,19 @@ class SetUserPassword extends React.Component<Props, State> {
     );
     this.setState({
       validatePasswordError: !userValidator.isPasswordValid(password),
-      passwordValidationError: validatePasswordError,
+      passwordConfirmationError: validatePasswordError,
       password: password
     });
   };
 
   handlePasswordValidationChange = (validatePassword: string) => {
-    const validatePasswordError = this.checkPasswords(
+    const passwordConfirmed = this.checkPasswords(
       this.state.password,
       validatePassword
     );
     this.setState({
       validatePassword,
-      passwordValidationError: !validatePasswordError
+      passwordConfirmationError: !passwordConfirmed
     });
   };
 
diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index 94daa53b63..2b8aa7b1e8 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -22,7 +22,7 @@ type State = {
   mailValidationError: boolean,
   nameValidationError: boolean,
   displayNameValidationError: boolean,
-  passwordValidationError: boolean,
+  passwordConfirmationError: boolean,
   validatePasswordError: boolean,
   validatePassword: string
 };
@@ -44,7 +44,7 @@ class UserForm extends React.Component<Props, State> {
       mailValidationError: false,
       displayNameValidationError: false,
       nameValidationError: false,
-      passwordValidationError: false,
+      passwordConfirmationError: false,
       validatePasswordError: false,
       validatePassword: ""
     };
@@ -70,7 +70,7 @@ class UserForm extends React.Component<Props, State> {
       this.state.validatePasswordError ||
       this.state.nameValidationError ||
       this.state.mailValidationError ||
-      this.state.passwordValidationError ||
+      this.state.passwordConfirmationError ||
       this.state.displayNameValidationError ||
       this.isFalsy(user.name) ||
       this.isFalsy(user.displayName)
@@ -117,7 +117,7 @@ class UserForm extends React.Component<Props, State> {
             type="password"
             onChange={this.handlePasswordValidationChange}
             value={this.state ? this.state.validatePassword : ""}
-            validationError={this.state.passwordValidationError}
+            validationError={this.state.passwordConfirmationError}
             errorMessage={t("validation.passwordValidation-invalid")}
             helpText={t("help.passwordConfirmHelpText")}
           />
@@ -195,7 +195,7 @@ class UserForm extends React.Component<Props, State> {
     );
     this.setState({
       validatePasswordError: !userValidator.isPasswordValid(password),
-      passwordValidationError: validatePasswordError,
+      passwordConfirmationError: validatePasswordError,
       user: { ...this.state.user, password }
     });
   };
@@ -207,7 +207,7 @@ class UserForm extends React.Component<Props, State> {
     );
     this.setState({
       validatePassword,
-      passwordValidationError: !validatePasswordError
+      passwordConfirmationError: !validatePasswordError
     });
   };