Improvement in resend emails