Add missing logic for users with empty UUID field.