Fix password reset feature

Addresses #11725 for 2.3.x (master)