Activate/Deactivate option unified