Removed unnecessary SQL queries when checking activation
Merge pull request #256 from g-wilson/integration

Removed unnecessary SQL queries when checking activation