Re: Activation email missing data
Since this is a cosmetic issue, as you indicate above, why not simply change the subject message. It may also help make registration emails from your site look even less suspicious than they do when they contain a link.
So, hardcode the subject message to say something like this:
Your New Bugle Notes Account is Ready to be Activated