*8599* modify password reset form to work with one step reset