Fix the order in which we create users/groups in PBIs