PC invitation tweaks.
Merge branch 'pc_invitation'