More tweaks to password resetting