Overwrite defaultAffiliation if we already have one. Fixes #69.