Password change & expert validation refactoring

behaviour