Merge pull request from p2pu/password_reset_link_bug revert changes to reset password email template