diff --git a/entityreference_prepopulate.module b/entityreference_prepopulate.module
index c7ec8d4..7230060 100644
--- a/entityreference_prepopulate.module
+++ b/entityreference_prepopulate.module
@@ -94,8 +94,7 @@ function entityreference_prepopulate_field_attach_form($entity_type, $entity, &$
       // If the field belongs to OG, we need to get the values for the "default"
       // and "admin" field modes.
       $field_name = $field['field_name'];
-
-      if (module_exists('og') && og_is_group_audience_field($field_name)) {
+      if (module_exists('og') && og_is_group_audience_field($field_name) && $instance['widget']['type'] == 'og_complex') {
         $ids = array();
         $field_modes = !user_access('administer group') ? array('default') : array('default', 'admin');
         foreach ($field_modes as $field_mode) {
@@ -106,7 +105,7 @@ function entityreference_prepopulate_field_attach_form($entity_type, $entity, &$
 
         }
       }
-      elseif ($ids = entityreference_prepopulate_get_values($field, $instance)) {
+      if ($ids = entityreference_prepopulate_get_values($field, $instance)) {
         $form_state['entityreference_prepopulate'][$instance['entity_type']][$instance['bundle']][$field_name] = $ids;
       }
 
@@ -224,7 +223,7 @@ function entityreference_prepopulate_get_values($field, $instance, $validate = T
     $validate,
   );
 
-  if (module_exists('og') && og_is_group_audience_field($field_name)) {
+  if (module_exists('og') && og_is_group_audience_field($field_name) && $instance['widget']['type'] == 'og_complex') {
     if (empty($instance['field_mode'])) {
       // group audience field, but no field-mode provided.
       return;