fixes #6060 - Fixes activation-key content override, BZ 1104638

Thanks!  I knew there was a more efficient route, just couldn't find it!