Fix activate as primary/deactivate