Password change & expert validation refactoring