Fixed flow for password reset