Updates to enumeration model
Fixed bugs in email invite request