BizTalk with Multiple companies MAJOR ISSUE

I have a client that has 2 companies set up in the Navision (3.60) database.

They receive sales orders from their BizTlak Partner for both companies.

I have both companies talking to the NAS andBizTalk. How do I configure BizTalk to talk back to each company??

The issue is that the BizTlak Partner is really only one organization, however, because of the way Navision uses organizations, it sets it up as 2. One for each company. That is all great until you go and try to enter the Organization Unieque Identifiers in BizTlak. It fails because it will not allow each organization to have the same identifier, and rightly so.

This seems like a major weakness on Navision's part.

Has anybody encountered this and found a solution or workaround??

Thanks in advance!!