#828 - ensure persisted UUID is always used if available