Corrected issue with mail confirmation.
Changes requested by Avir Naki.