--- og.module	2009-08-10 22:39:11.000000000 +0200
+++ og.module-consistent-groupedit	2009-11-09 13:49:51.000000000 +0100
@@ -1680,7 +1680,7 @@ function og_form_add_og_audience(&$form,
   }
   
   // Show read only item if we are non-admin, and in simple mode (i.e. non-checkboxes) and at least one group is in querystring
-  $simple = !user_access('administer organic groups') && !variable_get('og_audience_checkboxes', TRUE) && count($gids);
+  $simple = !user_access('administer organic groups') && !variable_get('og_audience_checkboxes', TRUE);
     
   // determine value of audience multi-select
   if (count($options) == 1 && $required) {
@@ -2321,4 +2321,5 @@ function og_check_token($token, $seed) {
  */
 function og_broadcast_access($node) {
   return og_is_group_admin($node) && module_exists('og_notifications');
-}
\ No newline at end of file
+}
+
--- includes/og.admin.inc	2009-06-22 17:59:27.000000000 +0200
+++ includes/og.admin.inc-consistent-groupselect-on-edit	2009-11-09 14:15:10.000000000 +0100
@@ -73,7 +73,7 @@ function og_admin_settings() {
     '#type' => 'checkbox', 
     '#title' => t('Audience checkboxes'), 
     '#default_value' => variable_get('og_audience_checkboxes', TRUE), 
-    '#description' => t('Show each group that the user is a member of as a checkbox in the "Audience" section. This enables the member to place her post into multiple groups. If unchecked, simplify the user interface by omitting the checkboxes and assuming user wants to post into the current group. This simplification only applies to new nodes, and not to edits of existing nodes. Group administrators always see checkboxes.')
+    '#description' => t('Show each group that the user is a member of as a checkbox in the "Audience" section. This enables the member to place her post into multiple groups. If unchecked, simplify the user interface by omitting the checkboxes and assuming user wants to post into the current group. If not checked, only the site-administrator will be able post into multiple groups or to move nodes between groups.')
   );
   
   // audience required