Dont stop CCs unnecessarily
Fix multiple user facing service registration