user activation and deactivation added