diff --git a/modules/redhen_contact/redhen_contact.module b/modules/redhen_contact/redhen_contact.module
index 1240dce..376b755 100644
--- a/modules/redhen_contact/redhen_contact.module
+++ b/modules/redhen_contact/redhen_contact.module
@@ -918,3 +918,23 @@ function redhen_contact_property_email_set(RedhenContact $contact, $name, $value
     'default' => TRUE
   );
 }
+
+/**
+ * Implements hook_query_TAG_alter().
+ */
+function redhen_contact_query_redhen_contact_access_alter(QueryAlterableInterface $query){
+  $path = pathinfo(current_path());
+  $path_elements = explode('/', $path['dirname']);
+
+  // Alter the query for the contact entityreference autocomplete to be responsive
+  // to name searches withing first,middle and last names.
+  if( isset($path_elements[0]) && 'entityreference' == $path_elements[0] &&
+  isset($path_elements[1]) && 'autocomplete' == $path_elements[1] ) {
+    $name = '%' . $path['filename'] . '%';
+    $or = db_or();
+    $or->condition('redhen_contact.first_name', $name, 'LIKE')
+      ->condition('redhen_contact.middle_name', $name, 'LIKE')
+      ->condition('redhen_contact.last_name', $name, 'LIKE');
+    $query->condition($or);
+  }
+}