diff --git a/scm-ui/ui-components/src/forms/PasswordConfirmation.tsx b/scm-ui/ui-components/src/forms/PasswordConfirmation.tsx
index 2db9a773fc..8d4468be4f 100644
--- a/scm-ui/ui-components/src/forms/PasswordConfirmation.tsx
+++ b/scm-ui/ui-components/src/forms/PasswordConfirmation.tsx
@@ -34,6 +34,7 @@ type State = {
 type Props = WithTranslation & {
   passwordChanged: (p1: string, p2: boolean) => void;
   passwordValidator?: (p: string) => boolean;
+  onReturnPressed?: () => void;
 };
 
 class PasswordConfirmation extends React.Component<Props, State> {
@@ -57,7 +58,7 @@ class PasswordConfirmation extends React.Component<Props, State> {
   }
 
   render() {
-    const { t } = this.props;
+    const { t, onReturnPressed } = this.props;
     return (
       <div className="columns is-multiline">
         <div className="column is-half">
@@ -78,6 +79,7 @@ class PasswordConfirmation extends React.Component<Props, State> {
             value={this.state ? this.state.confirmedPassword : ""}
             validationError={this.state.passwordConfirmationFailed}
             errorMessage={t("password.passwordConfirmFailed")}
+            onReturnPressed={onReturnPressed}
           />
         </div>
       </div>
diff --git a/scm-ui/ui-webapp/src/users/components/UserConverter.tsx b/scm-ui/ui-webapp/src/users/components/UserConverter.tsx
index cdcd24ffcf..4b2f0f0fa7 100644
--- a/scm-ui/ui-webapp/src/users/components/UserConverter.tsx
+++ b/scm-ui/ui-webapp/src/users/components/UserConverter.tsx
@@ -94,7 +94,15 @@ const UserConverter: FC<Props> = ({ user, fetchUser }) => {
     }
   };
 
-  const passwordChangeField = <PasswordConfirmation passwordChanged={changePassword} />;
+  const onReturnPressed = () => {
+    if (password && passwordValid) {
+      toInternal();
+    }
+  };
+
+  const passwordChangeField = (
+    <PasswordConfirmation passwordChanged={changePassword} onReturnPressed={onReturnPressed} />
+  );
   const passwordModal = (
     <Modal
       body={passwordChangeField}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java
index ff3914654d..f51be4ae11 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java
@@ -102,7 +102,7 @@ public class MeDtoFactory extends HalAppenderMapper {
     if (UserPermissions.changePublicKeys(user).isPermitted()) {
       linksBuilder.single(link("publicKeys", resourceLinks.user().publicKeys(user.getName())));
     }
-    if (userManager.isTypeDefault(user) && UserPermissions.changePassword(user).isPermitted()) {
+    if (!user.isExternal() && UserPermissions.changePassword(user).isPermitted()) {
       linksBuilder.single(link("password", resourceLinks.me().passwordChange()));
     }
     if (UserPermissions.changeApiKeys(user).isPermitted()) {