REFACTOR: move all conditions to guardian
Merge pull request #2507 from techAPJ/invite-patch-1

REFACTOR: move all conditions to guardian