tweaks to make invitation fields (almost) work