Yeh I think you're right, an extra JS step on the page that the email link leads to would help a lot.