Fix bug with New Company creation