Fixed #20079 -- Improve security of password reset tokens
Merge pull request #1280 from erikr/improve-password-reset2

Fixed #20079 -- Improved security of password reset tokens