diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/changePasswordPopup.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/changePasswordPopup.xhtml
index a82aa7684c1..dcc69acb5a1 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/changePasswordPopup.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/changePasswordPopup.xhtml
@@ -33,7 +33,7 @@
                             <div>
                                 <!-- old password -->
                                 <h:outputLabel for="oldPassword" value="#{msgs.oldPassword}"/>
-                                <p:password redisplay="true" id="oldPassword" class="password"
+                                <p:password redisplay="false" id="oldPassword" class="password"
                                             value="#{UserForm.oldPassword}" label="#{msgs.oldPassword}"
                                             required="true"/>
                             </div>
@@ -41,7 +41,7 @@
                             <div>
                                 <!-- new password -->
                                 <h:outputLabel for="newPassword" value="#{msgs.newPassword}"/>
-                                <p:password redisplay="true" id="newPassword" class="password"
+                                <p:password redisplay="false" id="newPassword" class="password"
                                             value="#{UserForm.passwordToEncrypt}" label="#{msgs.newPassword}"
                                             match="newPasswordRepeat" required="true"
                                             validatorMessage="#{msgs.passwordsDontMatch}"/>
@@ -50,7 +50,7 @@
                             <div>
                                 <!-- repeat new password -->
                                 <h:outputLabel for="newPasswordRepeat" value="#{msgs.confirmNewPassword}"/>
-                                <p:password redisplay="true" id="newPasswordRepeat" class="password"
+                                <p:password redisplay="false" id="newPasswordRepeat" class="password"
                                             value="#{UserForm.passwordToEncrypt}" label="#{msgs.confirmNewPassword}"
                                             required="true"/>
                             </div>
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/details.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/details.xhtml
index 74fc4e4b8a4..1086018ee82 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/details.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/details.xhtml
@@ -79,8 +79,10 @@
                                  icon="fa fa-pencil fa-lg"
                                  iconPos="right"
                                  immediate="true"
+                                 update=":changePasswordForm"
                                  styleClass="seoncdary"
                                  rendered="#{isConfigMode}">
+                    <p:resetInput target=":changePasswordForm"/>
                 </p:commandButton>
                 <p:commandButton onclick="PF('resetPasswordDialog').show()"
                                  id="resetPasswordButton"
@@ -89,7 +91,9 @@
                                  iconPos="right"
                                  immediate="true"
                                  styleClass="secondary"
+                                 update=":resetPasswordForm"
                                  rendered="#{isEditMode}">
+                    <p:resetInput target=":resetPasswordForm"/>
                 </p:commandButton>
             </div>
         </p:row>
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/resetPasswordPopup.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/resetPasswordPopup.xhtml
index d7a21d827a3..e649ee94831 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/resetPasswordPopup.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/resetPasswordPopup.xhtml
@@ -33,7 +33,7 @@
                                 <!-- new password -->
                                 <p:outputLabel for="newPassword"
                                                value="#{msgs.newPassword}"/>
-                                <p:password redisplay="true"
+                                <p:password redisplay="false"
                                             id="newPassword"
                                             class="password"
                                             value="#{UserForm.passwordToEncrypt}"
@@ -47,7 +47,7 @@
                                 <!-- repeat new password -->
                                 <h:outputLabel for="newPasswordRepeat"
                                                value="#{msgs.confirmNewPassword}"/>
-                                <p:password redisplay="true"
+                                <p:password redisplay="false"
                                             id="newPasswordRepeat"
                                             class="password"
                                             value="#{UserForm.passwordToEncrypt}"