Fixing the password reset issue #4