diff --git a/realname.module b/realname.module
index f4f4293..42b4b5b 100644
--- a/realname.module
+++ b/realname.module
@@ -315,15 +315,29 @@ function realname_autocomplete($string = '') {
     $query = db_select('users', 'u');
     $query->leftJoin('realname', 'rn', 'u.uid = rn.uid');
     $query->fields('u', array('uid'));
-    $query->condition('rn.realname', db_like($string) . '%', 'LIKE');
+    $query->condition('rn.realname', '%' . db_like($string) . '%', 'LIKE');
     $query->range(0, 10);
     $uids = $query->execute()->fetchCol();
     $accounts = user_load_multiple($uids);
 
     foreach ($accounts as $account) {
-      $matches[$account->name] = format_username($account);
+      $matches[format_username($account) . ' (' .  $account->uid . ')'] = format_username($account);
     }
   }
 
   drupal_json_output($matches);
 }
+
+/**
+ *
+ * Implements hook_widget_form_alter().
+ * overrides entityreference autocomplete fields that point to an entity
+ * of type 'user'
+ */
+function realname_field_widget_form_alter(&$element, &$form_state, $context) {
+  if ($context['field']['type'] == 'entityreference') {
+    if ($context['field']['settings']['target_type']== 'user') {
+      $element['target_id']['#autocomplete_path'] = 'realname/autocomplete';
+    }
+  }
+}