Password change & expert validation refactoring

Expert -> expert's