CE V30's incorrect TSCAL

CE V30's incorrect TSCAL

using build 590 (CE 5)
we are experiencing issues where our devices are pulling cals that have been assigned to other devices.

From what I understand the UUID on the Wyse Devices is the Product ID, I've confirmed that after flashing the 590 firmware the UUID (product id) is correct with the last digits corresponding to the MAC Address of the device...

I have also tested the EraseCAL utility from freewysemonkeys.com, but still picks up the same cal after connecting to terminal services. -- I believe that utility just deletes the registry information for the cal..

Anyone seen this before?

It seems if we do a factory reset the device picks up the proper cal but that really doesnt help us managing our devices.