Fix password reset feature

Addresses #11725 for 2.2.x

(cherry picked from commit c573e21a03f5ea4510ba9cf911bf20a52d7b0902)

Conflicts:
	core/docs/changelog.txt