improve email notification issue