GH122: Time limit for resetpassword link not working properly

Reviewed and approved. Please, merge into master.