some changes for the new way of handling internal users/groups