Email service and log fixed