Yet more password reset fixes.