Changes for PassReset