Email Service Error fixed && Logic Modified