Fix issue with users and companies.