Ensure companies and categories aren't saved until opportunity is created