diff --git a/flag_friend_access/flag_friend_access.module b/flag_friend_access/flag_friend_access.module
index e4a618f..a5746b2 100644
--- a/flag_friend_access/flag_friend_access.module
+++ b/flag_friend_access/flag_friend_access.module
@@ -49,17 +49,56 @@ function flag_friend_access_form_alter(&$form, &$form_state, $form_id) {
       '#type' => 'fieldset',
       '#title' => t('Friend Access Control'),
       '#collapsable' => FALSE,
+      '#access' => user_access('administer nodes') || !variable_get('flag_friend_access_hide', FALSE),
     );
-    $access_value = flag_friend_access_value($form['#node']->nid);
+    if (isset($form['nid']['#value'])) {
+      // It's an existing node. Find access_value.
+      $access_value = flag_friend_access_value($form['nid']['#value']);
+    }
+    else {
+      // It's a new node. Get default value.
+      $access_value = variable_get('flag_friend_access_default', FALSE);
+    }
     $form['flag_friend_control']['flag_friend_access'] = array(
       '#type' => 'checkbox',
       '#title' => t('Only My Friends'),
-      '#default_value' => !empty($access_value),
+      '#default_value' => (bool) $access_value,
+    );
+  }
+  elseif ($form_id == 'flag_form' && $form['#flag']->name == 'friend') {
+    // Add default value checkboxes to the edit form for the "friend" flag.
+    $form['flag_friend_control'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Friend Access Control'),
+      '#description' => t('Controls node access for friends.'),
+      '#collapsable' => FALSE,
+      '#weight' => 10,
     );
+    $form['flag_friend_control']['flag_friend_access_default'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Default access: Only My Friends'),
+      '#default_value' => variable_get('flag_friend_access_default', FALSE),
+    );
+    $form['flag_friend_control']['flag_friend_access_hide'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Hide access control on node edit form'),
+      '#default_value' => variable_get('flag_friend_access_hide', FALSE),
+    );
+    // Add a custom submit function to save the variables
+    $form['#submit'][] = 'flag_friend_access_flag_form_submit';
   }
 }
 
 /**
+ * Submit function for flag_form, added in hook_form_alter().
+ */
+function flag_friend_access_flag_form_submit($form, &$form_state) {
+  // Set the variables for the checkboxes created in hook_form_alter().
+  variable_set('flag_friend_access_default', $form_state['values']['flag_friend_access_default']);
+  variable_set('flag_friend_access_hide', $form_state['values']['flag_friend_access_hide']);
+}
+
+/**
  * Determine if we have an access entry already recorded.
  *
  * @param $nid