EU-2170 - change the expected form of the system id