diff --git a/email_registration.module b/email_registration.module
index 68dd3f5..a8c06d4 100644
--- a/email_registration.module
+++ b/email_registration.module
@@ -124,6 +124,8 @@ function custom_email_registration_name_submit($form, &$form_state) {
 function email_registration_user_login_validate($form, &$form_state) {
   if (isset($form_state['values']['name'])) {
     if ($name = db_query('SELECT name FROM {users} WHERE LOWER(mail) = LOWER(:name)', array(':name' => $form_state['values']['name']))->fetchField()) {
+      // Keep the email value in form state for furher validation.
+      $form_state['values']['email'] = $form_state['values']['name'];
       $form_state['values']['name'] = $name;
     }
   }