more pwreset fixes