Fix Password Reset Bugs