Fixed verify email (fix #1083, fix #1084)