Rory's changes to email verification