diff --git a/sites/all/modules/contrib/entityreference/entityreference.module b/sites/all/modules/contrib/entityreference/entityreference.module
index c0c9f58f..ec83a962 100644
--- a/sites/all/modules/contrib/entityreference/entityreference.module
+++ b/sites/all/modules/contrib/entityreference/entityreference.module
@@ -1311,6 +1311,9 @@ function entityreference_field_formatter_prepare_view($entity_type, $entities, $
         $items[$id][$delta]['entity'] = $target_entities[$item[$column]];
         // Check whether the user has access to the referenced entity.
         $has_view_access = (entity_access('view', $target_type, $target_entities[$item[$column]]) !== FALSE);
+        if (isset($items[$id][$delta]['entity']->uid)) {
+          $has_view_access = TRUE;
+        }
         $has_update_access = (entity_access('update', $target_type, $target_entities[$item[$column]]) !== FALSE);
         $items[$id][$delta]['access'] = ($has_view_access || $has_update_access);
       }
diff --git a/sites/all/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/sites/all/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
index 6ec28a4b..e39effb8 100644
--- a/sites/all/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
+++ b/sites/all/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
@@ -195,6 +195,10 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select
       $entity_type = $this->field['settings']['target_type'];
       $query = $this->buildEntityFieldQuery();
       $query->entityCondition('entity_id', $ids, 'IN');
+      if ($entity_type == "user") {
+        unset($query->propertyCondition);
+        $query->entityCondition('status', 0, '>=');
+      }
       $result = $query->execute();
       if (!empty($result[$entity_type])) {
         return array_keys($result[$entity_type]);
@@ -309,7 +313,15 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select
    */
   public function getLabel($entity) {
     $target_type = $this->field['settings']['target_type'];
-    return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t(ENTITYREFERENCE_DENIED);
+        switch ($target_type) {
+      case 'user':
+        return entity_label($target_type, $entity);
+        break;
+
+      default:
+        return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -');
+        break;
+    }
   }
 
   /**