Some Changes added to User Mailer