diff --git a/scm-ui/ui-webapp/src/users/components/UserForm.tsx b/scm-ui/ui-webapp/src/users/components/UserForm.tsx
index da231384b5..366a05633e 100644
--- a/scm-ui/ui-webapp/src/users/components/UserForm.tsx
+++ b/scm-ui/ui-webapp/src/users/components/UserForm.tsx
@@ -120,7 +120,7 @@ class UserForm extends React.Component<Props, State> {
       this.state.displayNameValidationError ||
       this.state.nameValidationError ||
       !user.displayName ||
-      (!user.external && !user.password)
+      (this.props.user?.external && !user.external && !user.password)
     );
   };