Index: sites/all/modules/og_project/og_project.module
===================================================================
--- sites/all/modules/og_project/og_project.module	(revision 217)
+++ sites/all/modules/og_project/og_project.module	(working copy)
@@ -47,12 +47,7 @@
   if (variable_get('og_project_release_automatic_audience', FALSE)) {
     if (empty($form['nid']['#value'])) {
       $project_nid = $form['project']['#value']->nid;
-      if (!empty($form['og_nodeapi']['visible']['og_groups'])) {
-        $form['og_nodeapi']['visible']['og_groups']['#default_value'] = array($project_nid => $project_nid);
-      }
-      elseif (!empty($form['og_nodeapi']['invisible']['og_groups'])) {
-        $form['og_nodeapi']['invisible']['og_groups']['#value'] = array($project_nid => $project_nid);
-      }
+      _og_project_alter_og_nodeapi($form, $project_nid);
     }
     // Either way, hide the OG UI.
     $form['og_nodeapi']['#access'] = FALSE;
@@ -66,12 +61,7 @@
   if (variable_get('og_project_issue_automatic_audience', FALSE)) {
     if (empty($form['nid']['#value'])) {
       $project_nid = $form['project_info']['pid']['#value'];
-      if (!empty($form['og_nodeapi']['visible']['og_groups'])) {
-        $form['og_nodeapi']['visible']['og_groups']['#default_value'] = array($project_nid => $project_nid);
-      }
-      elseif (!empty($form['og_nodeapi']['invisible']['og_groups'])) {
-        $form['og_nodeapi']['invisible']['og_groups']['#value'] = array($project_nid => $project_nid);
-      }
+      _og_project_alter_og_nodeapi($form, $project_nid);
     }
     // Either way, hide the OG UI.
     $form['og_nodeapi']['#access'] = FALSE;
@@ -79,6 +69,25 @@
 }
 
 /**
+ * Alter the contents of the og_nodeapi data in a project issue or project release.
+ */
+function _og_project_alter_og_nodeapi(&$form, $project_nid) {
+  if (og_is_group_type('project_project')) {
+    $groups = array($project_nid => $project_nid);
+  }
+  else {
+    $project_node = node_load($project_nid);
+    $groups = $project_node->og_groups;
+  }
+  if (!empty($form['og_nodeapi']['visible']['og_groups'])) {
+    $form['og_nodeapi']['visible']['og_groups']['#default_value'] = $groups;
+  }
+  elseif (!empty($form['og_nodeapi']['invisible']['og_groups'])) {
+    $form['og_nodeapi']['invisible']['og_groups']['#value'] = $groups;
+  }
+}
+
+/**
  * Implement hook_og_links_alter().
  *
  * If the currently active group is a project node, fix the links in the group
Index: sites/all/modules/og_project/og_project.settings.inc
===================================================================
--- sites/all/modules/og_project/og_project.settings.inc	(revision 217)
+++ sites/all/modules/og_project/og_project.settings.inc	(working copy)
@@ -11,21 +11,25 @@
  */
 function og_project_settings_form($form_state) {
   $project_group_behavior = variable_get('og_content_type_usage_project_project', 'group_post_standard');
-  if ($project_group_behavior == 'group') {
+  if (($project_group_behavior == 'group') || ($project_group_behavior = 'group_post_standard') || ($project_group_behavior = 'group_post_wiki')) {
     $types = array(
       'project_issue' => 'og_project_issue_automatic_audience',
       'project_release' => 'og_project_release_automatic_audience',
     );
     foreach ($types as $type => $variable) {
       if (module_exists($type)) {
-        $form['og_project_audience'][$variable] = _og_project_audience_setting($type, $variable);
+        $form['og_project_audience'][$variable] = _og_project_audience_setting($type, $variable, ($project_group_behavior == 'group'));
       }
     }
     if (!empty($form['og_project_audience'])) {
+      $group_behaviors['group'] = t('Organic Groups');
+      $group_behaviors['group_post_standard'] = t('Standard Group Posts');
+      $group_behaviors['group_post_wiki'] = t('Wiki Group Posts');
       $placeholders['%project'] = node_get_types('name', 'project_project');
+      $placeholders['%project_group_behavior'] = $group_behaviors[$project_group_behavior];
       $form['og_project_audience']['#type'] = 'fieldset';
       $form['og_project_audience']['#title'] = t('Automatic group audience for %project content', $placeholders);
-      $form['og_project_audience']['#description'] = t('Your site is configured with %project nodes as Organic Groups. Projects can also have other nodes associated with them, which you may want to have automatically posted to the corresponding Organic Group.', $placeholders);
+      $form['og_project_audience']['#description'] = t('Your site is configured with %project nodes as %project_group_behavior. Projects can also have other nodes associated with them, which you may want to have automatically posted to the corresponding Organic Group.', $placeholders);
     }
   }
   if (!empty($form)) {
@@ -47,9 +51,12 @@
  *
  * @see og_project_settings_form()
  */
-function _og_project_audience_setting($type, $variable) {
+function _og_project_audience_setting($type, $variable, $project_is_group_type) {
   $placeholders['%project'] = node_get_types('name', 'project_project');
   $placeholders['%node_type'] = node_get_types('name', $type);
+  if (!$project_is_group_type) {
+    $placeholders['%project'] = t("Group of the !project", array('!project' => node_get_types('name', 'project_project')));
+  }
 
   $group_behavior = variable_get("og_content_type_usage_$type", 'group_post_standard');
   if ($group_behavior == 'group_post_standard' || $group_behavior == 'group_post_wiki') {