Correct matching of servers when adding new roles