Fix to group/user identification