Fixed issue that an user password could not be changed

A logical error was the problem. If a password was valid, an error message
was returned and not further processed.

Change-Id: I738a9d4bb288f89e38a7fd62370f0cf9ad36e7ec
Merge "Fixed issue that an user password could not be changed"