Fix password reset feature

Addresses #11725 for 2.3.x (master)
Merge remote-tracking branch 'upstream/pr/11753' into pr/11753

* upstream/pr/11753:
  Fix password reset feature

Conflicts:
	core/docs/changelog.txt