Really fix #69.
Merge #65
We also added the field for invitations, as it's needed for collections to work.