[bug 984389] Streamline account activation email

r?