diff --git a/docs/de/user/user/assets/user-create.png b/docs/de/user/user/assets/user-create.png
index a7d625c430..50e1b605fc 100644
Binary files a/docs/de/user/user/assets/user-create.png and b/docs/de/user/user/assets/user-create.png differ
diff --git a/docs/de/user/user/assets/user-settings-password.png b/docs/de/user/user/assets/user-settings-password.png
index ed5bc5aa0e..ff17727a86 100644
Binary files a/docs/de/user/user/assets/user-settings-password.png and b/docs/de/user/user/assets/user-settings-password.png differ
diff --git a/docs/de/user/user/assets/user-settings-permissions.png b/docs/de/user/user/assets/user-settings-permissions.png
index 40a874f787..b0ee623868 100644
Binary files a/docs/de/user/user/assets/user-settings-permissions.png and b/docs/de/user/user/assets/user-settings-permissions.png differ
diff --git a/docs/en/user/user/assets/user-create.png b/docs/en/user/user/assets/user-create.png
index eedee01634..f7678ac041 100644
Binary files a/docs/en/user/user/assets/user-create.png and b/docs/en/user/user/assets/user-create.png differ
diff --git a/docs/en/user/user/assets/user-settings-password.png b/docs/en/user/user/assets/user-settings-password.png
index acaf04876b..457ec4627f 100644
Binary files a/docs/en/user/user/assets/user-settings-password.png and b/docs/en/user/user/assets/user-settings-password.png differ
diff --git a/docs/en/user/user/assets/user-settings-permissions.png b/docs/en/user/user/assets/user-settings-permissions.png
index fc2ab1b4e3..aa325d3386 100644
Binary files a/docs/en/user/user/assets/user-settings-permissions.png and b/docs/en/user/user/assets/user-settings-permissions.png differ
diff --git a/scm-ui/ui-webapp/public/locales/de/commons.json b/scm-ui/ui-webapp/public/locales/de/commons.json
index ae3e757eec..dfba48cd5e 100644
--- a/scm-ui/ui-webapp/public/locales/de/commons.json
+++ b/scm-ui/ui-webapp/public/locales/de/commons.json
@@ -86,6 +86,7 @@
     "error-message": "'me' ist nicht definiert"
   },
   "password": {
+    "subtitle": "Passwort ändern",
     "label": "Passwort",
     "newPassword": "Neues Passwort",
     "currentPassword": "Aktuelles Passwort",
diff --git a/scm-ui/ui-webapp/public/locales/de/permissions.json b/scm-ui/ui-webapp/public/locales/de/permissions.json
index 57c061743a..320dec7121 100644
--- a/scm-ui/ui-webapp/public/locales/de/permissions.json
+++ b/scm-ui/ui-webapp/public/locales/de/permissions.json
@@ -1,6 +1,7 @@
 {
   "setPermissions": {
-    "button": "Berechtigungen speichern",
+    "subtitle": "Berechtigungen setzen",
+    "button": "Berechtigungen setzen",
     "setPermissionsSuccessful": "Berechtigungen erfolgreich gespeichert"
   }
 }
diff --git a/scm-ui/ui-webapp/public/locales/de/users.json b/scm-ui/ui-webapp/public/locales/de/users.json
index 9925209635..3936edb43b 100644
--- a/scm-ui/ui-webapp/public/locales/de/users.json
+++ b/scm-ui/ui-webapp/public/locales/de/users.json
@@ -61,6 +61,7 @@
     }
   },
   "singleUserPassword": {
+    "subtitle": "Passwort setzen",
     "button": "Passwort setzen",
     "setPasswordSuccessful": "Das Passwort wurde erfolgreich gespeichert."
   },
diff --git a/scm-ui/ui-webapp/public/locales/en/commons.json b/scm-ui/ui-webapp/public/locales/en/commons.json
index 87b08e89d4..f28a746eeb 100644
--- a/scm-ui/ui-webapp/public/locales/en/commons.json
+++ b/scm-ui/ui-webapp/public/locales/en/commons.json
@@ -87,6 +87,7 @@
     "error-message": "'me' is undefined"
   },
   "password": {
+    "subtitle": "Change Password",
     "label": "Password",
     "newPassword": "New Password",
     "currentPassword": "Current Password",
diff --git a/scm-ui/ui-webapp/public/locales/en/permissions.json b/scm-ui/ui-webapp/public/locales/en/permissions.json
index 32c7157a51..adca743c20 100644
--- a/scm-ui/ui-webapp/public/locales/en/permissions.json
+++ b/scm-ui/ui-webapp/public/locales/en/permissions.json
@@ -1,5 +1,6 @@
 {
   "setPermissions": {
+    "subtitle": "Set Permissions",
     "button": "Set Permissions",
     "setPermissionsSuccessful": "Permissions set successfully"
   }
diff --git a/scm-ui/ui-webapp/public/locales/en/users.json b/scm-ui/ui-webapp/public/locales/en/users.json
index 9feb0753a6..ca13a6a1c9 100644
--- a/scm-ui/ui-webapp/public/locales/en/users.json
+++ b/scm-ui/ui-webapp/public/locales/en/users.json
@@ -61,6 +61,7 @@
     }
   },
   "singleUserPassword": {
+    "subtitle": "Set Password",
     "button": "Set Password",
     "setPasswordSuccessful": "Password successfully set"
   },
diff --git a/scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx b/scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx
index 6193042706..59116dea96 100644
--- a/scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx
+++ b/scm-ui/ui-webapp/src/containers/ChangeUserPassword.tsx
@@ -28,7 +28,8 @@ import {
   Level,
   Notification,
   PasswordConfirmation,
-  SubmitButton
+  SubmitButton,
+  Subtitle
 } from "@scm-manager/ui-components";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { Me } from "@scm-manager/ui-types";
@@ -55,9 +56,6 @@ class ChangeUserPassword extends React.Component<Props, State> {
       oldPassword: "",
       password: "",
       loading: false,
-      passwordConfirmationError: false,
-      validatePasswordError: false,
-      validatePassword: "",
       passwordChanged: false,
       passwordValid: false
     };
@@ -127,6 +125,7 @@ class ChangeUserPassword extends React.Component<Props, State> {
 
     return (
       <form onSubmit={this.submit}>
+        <Subtitle subtitle={t("password.subtitle")} />
         {message}
         <div className="columns">
           <div className="column">
diff --git a/scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx b/scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx
index 29bdf03803..6b730cc107 100644
--- a/scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx
+++ b/scm-ui/ui-webapp/src/permissions/components/SetPermissions.tsx
@@ -25,7 +25,7 @@ import React from "react";
 import { connect } from "react-redux";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { Link } from "@scm-manager/ui-types";
-import { ErrorNotification, Level, Notification, SubmitButton } from "@scm-manager/ui-components";
+import { ErrorNotification, Level, Notification, SubmitButton, Subtitle } from "@scm-manager/ui-components";
 import { getLink } from "../../modules/indexResource";
 import { loadPermissionsForEntity, setPermissions } from "./handlePermissions";
 import PermissionsWrapper from "./PermissionsWrapper";
@@ -134,6 +134,7 @@ class SetPermissions extends React.Component<Props, State> {
 
     return (
       <form onSubmit={this.submit}>
+        <Subtitle subtitle={t("setPermissions.subtitle")} />
         {message}
         {this.renderPermissions()}
         <Level
diff --git a/scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx b/scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx
index 3568a6b860..a9568851a3 100644
--- a/scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx
+++ b/scm-ui/ui-webapp/src/users/components/SetUserPassword.tsx
@@ -24,7 +24,14 @@
 import React from "react";
 import { WithTranslation, withTranslation } from "react-i18next";
 import { User } from "@scm-manager/ui-types";
-import { ErrorNotification, Level, Notification, PasswordConfirmation, SubmitButton } from "@scm-manager/ui-components";
+import {
+  ErrorNotification,
+  Subtitle,
+  Level,
+  Notification,
+  PasswordConfirmation,
+  SubmitButton
+} from "@scm-manager/ui-components";
 import { setPassword } from "./setPassword";
 
 type Props = WithTranslation & {
@@ -46,9 +53,6 @@ class SetUserPassword extends React.Component<Props, State> {
     this.state = {
       password: "",
       loading: false,
-      passwordConfirmationError: false,
-      validatePasswordError: false,
-      validatePassword: "",
       passwordChanged: false,
       passwordValid: false
     };
@@ -85,14 +89,16 @@ class SetUserPassword extends React.Component<Props, State> {
       const { password } = this.state;
       this.setLoadingState();
       setPassword(user._links.password.href, password)
-        .then(result => {
+        .then((result) => {
           if (result.error) {
             this.setErrorState(result.error);
           } else {
             this.setSuccessfulState();
           }
         })
-        .catch(err => {});
+        .catch((err) => {
+          this.setErrorState(err);
+        });
     }
   };
 
@@ -116,6 +122,7 @@ class SetUserPassword extends React.Component<Props, State> {
 
     return (
       <form onSubmit={this.submit}>
+        <Subtitle subtitle={t("singleUserPassword.subtitle")} />
         {message}
         <PasswordConfirmation
           passwordChanged={this.passwordChanged}