improved activate/deactivate methods validation
5 files changed