Enhancement change password logic. close #22
Small refactor.