Implement rest of change password scenario
refactor