- minor updates to Email Service