Add email verification, not fully tested