Make Email verification work properly.