Fixed validation problems with city and affiliation type.