Bugfix. Invitations improvement