Fixes #697 - Cleanup activation
Merge pull request #750 from retlehs/fix_activation

Fix activation page