Don't automatically associate companies with contacts if contact already has an association

We have turned on the setting "Create and associate Companies with Contacts" as we find it useful when contacts are orphans/without associated company.

Due to the nature of our business we have many companies with the same company domain name.

Problem: When we manually add a new contact to a company, the contact is (of course) associated to the company. But the setting "Create and associate Companies with Contacts" also adds an associated company - ending up with 2 associated companies, when we only want 1.

Suggestion: don’t automatically associate companies with contacts if the contact already has an association