Small changes to user guid