Added a untested support of email confirmation