E-mail verification improved