Email issue fixed