Worked more on email settings