Small invitation fix
small invitation fix 2
small invitation fix 3
merge with ozzy's latest
Parse email email before adding invitations