Revert "Correct changing of password."

This reverts commit c27f0b572b53699ea03426fa6a66e0181662e884.
Revert "Revert "Correct changing of password.""

This reverts commit 59527b77a26205c9a9ece7dff86d7c1a4785ef9f.