Fixed Email issue