diff -rupN ./flag_friend/flag_friend_access/flag_friend_access.install ./flag_friend/flag_friend_access/flag_friend_access.install
--- ./flag_friend/flag_friend_access/flag_friend_access.install	2010-03-24 16:18:35.000000000 +0100
+++ ./flag_friend/flag_friend_access/flag_friend_access.install	2010-10-31 00:23:27.953889388 +0200
@@ -18,6 +18,7 @@ function flag_friend_access_install() {
  */
 function flag_friend_access_uninstall() {
   drupal_uninstall_schema('flag_friend_access');
+  db_query("DELETE FROM {variable} WHERE name LIKE 'flag_friend_access_%'");
   drupal_set_message(t('The flag_friend_access module was successfully uninstalled.'));
 }
 
diff -rupN ./flag_friend/flag_friend_access/flag_friend_access.module ./flag_friend/flag_friend_access/flag_friend_access.module
--- ./flag_friend/flag_friend_access/flag_friend_access.module	2010-03-24 16:18:35.000000000 +0100
+++ ./flag_friend/flag_friend_access/flag_friend_access.module	2010-10-31 01:54:09.889384307 +0200
@@ -43,8 +43,8 @@ function flag_friend_access_node_access_
  * Implementation of hook_form_alter().
  */
 function flag_friend_access_form_alter(&$form, &$form_state, $form_id) {
-  // add in a checkbox only if the 
-  if (isset($form['#node']) && $form['#node']->type . '_node_form' == $form_id) {
+  // add in a checkbox only if the
+  if (isset($form['#node']) && $form['#node']->type . '_node_form' == $form_id && variable_get('flag_friend_access_'. $form['#node']->type, 0) == 1) {
     // We have a node form alter in our stuff.
     $form['flag_friend_control'] = array(
       '#type' => 'fieldset',
@@ -58,6 +58,25 @@ function flag_friend_access_form_alter(&
       '#default_value' => !empty($access_value),
     );
   }
+  if ($form_id == 'node_type_form') {
+    $form['friend_control'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Friend access control'),
+      '#description' => t('Allow %friend-access-control for this content type.', array('%friend-access-control' => t('Friend Access Control'))),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
+    $form['friend_control']['flag_friend_access'] = array(
+      '#type' => 'select',
+      '#title' => t('Friend access'),
+      '#description' => t('<em>No</em> will hide the %option option in node forms.', array('%option' => t('Only My Friends'))),
+      '#options' => array(
+        0 => t('No'),
+        1 => t('Yes')
+      ),
+      '#default_value' => variable_get('flag_friend_access_'. $form['#node_type']->type, 0),
+    );
+  }
 }
 
 /**
diff -rupN ./flag_friend/flag_friend_access/README.txt ./flag_friend/flag_friend_access/README.txt
--- ./flag_friend/flag_friend_access/README.txt	1970-01-01 01:00:00.000000000 +0100
+++ ./flag_friend/flag_friend_access/README.txt	2010-10-31 01:48:31.201389372 +0200
@@ -0,0 +1,16 @@
+// $Id:$
+
+Flag Friend Access
+
+Allows users to specify that only their friends can view this piece of content.
+
+USAGE
+--------------------------------------------------------------------------------
+Administer content types and use the option "Friend access" to enable or disable
+the Friend Access Control functionality per content type.
+
+Note:
+If you are use the updated version of Flag Friend Access module with the
+functionality to enable/disable the Friend Access Control per content type make
+sure the existing content does not get problems if for content types is now
+disabled the Friend Access Control functionality.
+