Allow enterprise enable without an owner
Refactor enterprise import