Final email confirm bug fix