simplify password settings code

- I get quite some unreproducible exception reports regarding password settings code

Resolves #117