More work on email verifications

I'm too lazy to split this up into multiple commits <.<