Email Enhancements + UAE membership fix!