** Fixed inconsistencies in refactoring
Password reset functionality