Refined password reset flow