diff --git a/entityreference.module b/entityreference.module
index 80191d7..984485b 100644
--- a/entityreference.module
+++ b/entityreference.module
@@ -865,7 +865,7 @@ function entityreference_field_widget_form(&$form, &$form_state, $field, $instan
         '#size' => $instance['widget']['settings']['size'],
         '#element_validate' => array('_entityreference_autocomplete_validate'),
       );
-      return array('target_id' => $element);
+      return $element;
     }
     else {
       $element += array(
@@ -902,7 +902,7 @@ function _entityreference_autocomplete_validate($element, &$form_state, $form) {
     }
   }
   // Update the value of this element so the field can validate the product IDs.
-  form_set_value($element, $value, $form_state);
+  form_set_value($element['target_id'], $value, $form_state);
 }
 
 function _entityreference_autocomplete_tags_validate($element, &$form_state, $form) {