Email confirmation seems to be working well. Committing before removing
all the meh stuff.