Wrong EMCU when creating using Credit Memo functionality - P4210

Hi,

we've recently migrated the business from Branch plant A to branch plant B.

Customer service has orders for which it needs to create a return order. These orders are sitting in BP A.

We have a new version of P4210 which defaults the BP into the new one; but when pulling the 'old' order it gets populated by JDE with EMCU in the order = A.

We've tried with row security for the old BP but that only restricts them from creating the actual order

We've tried as well with the configuration of the User Location in order to default BP B, but doesn't help.