diff --git a/og_ui/og_ui.admin.inc b/og_ui/og_ui.admin.inc
index 52bc0e7..291692f 100644
--- a/og_ui/og_ui.admin.inc
+++ b/og_ui/og_ui.admin.inc
@@ -163,6 +163,16 @@ function og_ui_add_users($form, &$form_state, $group_type, $gid) {
   }
 
   $field_names = og_get_group_audience_fields();
+
+  // Filter the list to only include valid entity types.
+  // TODO Bundle check here as well?
+  foreach($field_names as $name => $friendly_name) {
+    $field = field_info_field($name);
+    if ($field['settings']['target_type'] != $group_type) {
+      unset($field_names[$name]);
+    }
+  }
+
   $field_name = !empty($form_state['values']['field_name']) ? $form_state['values']['field_name'] : key($field_names);
 
   if (count($field_names) > 1) {