Improving email confirmation (Part 2)