Fix for user affiliations