email invite improvement wip