More Email Verification

Since GitHub for Windows didn't pick these changes up the first time...