Password change & expert validation refactoring

Needs some text :)