Cleanups
Check for account variable in activation template

Fixes bug #3060