retooled most of the email confirmation setup