[CHG] Use User Unique ID replace of UID