Tweak password reset mail and related