Updated Client/Server to get user affiliation now