Organisations that act in different roles with different addresses have an issue with the registration number

An example from FI, I don't know if this is an issue for anyone else. Hansel acts as a CPB buyer in which role it has one set of addresses in use. Hansel also acts as an eSender (operates Hilma) and for this role there must be different email address and web site address in use and thus Hansel appears as two separate organisations on Hansel's notices (by design).

Recently a rule was introduced (1.7-->1.10) that two separate organisations can't have the same registration number which caused an issue sending Hansel's notices. We changed the eSender's registration number to VAT-format and kept the buyer's registration number in the national format and avoided the issue. This is not optimal of course, although both formats are acceptable. Any ideas how this problem could be solved in the future? Using the same addresses is simply not possible. A minor issue, but this same issue could be seen if the Finnish Market Court, for example, would publish a notice as it has a double role and there might be others brewing up elsewhere.

On a related note, is there really a need to show the eSender in such a prominent manner on the notices? To our users this creates some confusion.