diff --git a/email_registration.module b/email_registration.module
index cad6737..ff97deb 100644
--- a/email_registration.module
+++ b/email_registration.module
@@ -178,7 +178,8 @@ function email_registration_user_login_validate($form, &$form_state) {
   if (isset($form_state['values']['name'])) {
     // Keep the email value in form state for furher validation.
     $form_state['values']['email'] = $form_state['values']['name'];
-    if ($name = db_result(db_query("SELECT name FROM {users} WHERE LOWER(mail) = LOWER('%s')", $form_state['values']['name']))) {
+    $query = variable_get('email_registration_name_query', "SELECT name FROM {users} WHERE LOWER(mail) = LOWER('%s')");
+    if ($name = db_result(db_query($query, $form_state['values']['name']))) {
       $form_state['values']['name'] = $name;
     }
   }