Guid value conversion

Convert to using the user's GUID value instead of UPN for data