Adding email confirmation, to be tested