Add email confirmation and custom forms