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.
\ Kein Zeilenumbruch am Dateiende.
diff -rupN ./flag_friend/flag_friend_access/translations/flag_friend_access.de.po ./flag_friend/flag_friend_access/translations/flag_friend_access.de.po
--- ./flag_friend/flag_friend_access/translations/flag_friend_access.de.po	1970-01-01 01:00:00.000000000 +0100
+++ ./flag_friend/flag_friend_access/translations/flag_friend_access.de.po	2010-10-31 02:06:21.673892048 +0200
@@ -0,0 +1,74 @@
+# $Id$
+#
+# German translation of Flag friend access control
+# Copyright YEAR NAME <EMAIL@ADDRESS>
+# Generated from files:
+#  flag_friend_access.module,v 1.1.2.4 2010/03/24 15:18:35 sirkitree
+#  flag_friend_access.install,v 1.1.2.2 2010/03/24 15:18:35 sirkitree
+#  flag_friend_access.info: n/a
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2010-10-31 01:58+0200\n"
+"PO-Revision-Date: 2010-10-31 01:58+0200\n"
+"Last-Translator: quiptime <quiptime@gmail.com>\n"
+"Language-Team: German <EMAIL@ADDRESS>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: flag_friend_access.module:51;65
+msgid "Friend Access Control"
+msgstr "Zugriffskontrolle Freunde"
+
+#: flag_friend_access.module:57;72
+msgid "Only My Friends"
+msgstr "Nur meine Freunde"
+
+#: flag_friend_access.module:64
+msgid "Friend access control"
+msgstr ""
+
+#: flag_friend_access.module:65
+msgid "Allow %friend-access-control for this content type."
+msgstr "Erlaubt %friend-access-control für diesen Inhaltstyp."
+
+#: flag_friend_access.module:71
+msgid "Friend access"
+msgstr "Freundezugriff"
+
+#: flag_friend_access.module:72
+msgid "<em>No</em> will hide the %option option in node forms."
+msgstr "<em>Nein</em> verbirgt die Option %option in Node-Formularen."
+
+#: flag_friend_access.module:74
+msgid "No"
+msgstr "Nein"
+
+#: flag_friend_access.module:75
+msgid "Yes"
+msgstr "Ja"
+
+#: flag_friend_access.install:13
+msgid "The flag_friend_access module was successfully installed."
+msgstr "Das Modul Flag friend access control wurde installiert."
+
+#: flag_friend_access.install:22
+msgid "The flag_friend_access module was successfully uninstalled."
+msgstr "Das Modul Flag friend access control wurde deinstalliert."
+
+#: flag_friend_access.info:0
+msgid "Flag friend access control"
+msgstr "Flag friend access control"
+
+#: flag_friend_access.info:0
+msgid "Allows users to specify that only their friends can view this piece of content"
+msgstr "Ermöglicht Benutzern festzulegen, dass nur ihren Freunden ein Inhalt angezeigt wird."
+
+#: flag_friend_access.info:0
+msgid "Flags"
+msgstr "Kennzeichnungen"
+
diff -rupN ./flag_friend/flag_friend_access/translations/flag_friend_access.pot ./flag_friend/flag_friend_access/translations/flag_friend_access.pot
--- ./flag_friend/flag_friend_access/translations/flag_friend_access.pot	1970-01-01 01:00:00.000000000 +0100
+++ ./flag_friend/flag_friend_access/translations/flag_friend_access.pot	2010-10-31 01:59:51.237384942 +0200
@@ -0,0 +1,74 @@
+# $Id$
+#
+# LANGUAGE translation of Flag friend access control
+# Copyright YEAR NAME <EMAIL@ADDRESS>
+# Generated from files:
+#  flag_friend_access.module,v 1.1.2.4 2010/03/24 15:18:35 sirkitree
+#  flag_friend_access.install,v 1.1.2.2 2010/03/24 15:18:35 sirkitree
+#  flag_friend_access.info: n/a
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2010-10-31 01:57+0200\n"
+"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: flag_friend_access.module:51;65
+msgid "Friend Access Control"
+msgstr ""
+
+#: flag_friend_access.module:57;72
+msgid "Only My Friends"
+msgstr ""
+
+#: flag_friend_access.module:64
+msgid "Friend access control"
+msgstr ""
+
+#: flag_friend_access.module:65
+msgid "Allow %friend-access-control for this content type."
+msgstr ""
+
+#: flag_friend_access.module:71
+msgid "Friend access"
+msgstr ""
+
+#: flag_friend_access.module:72
+msgid "<em>No</em> will hide the %option option in node forms."
+msgstr ""
+
+#: flag_friend_access.module:74
+msgid "No"
+msgstr ""
+
+#: flag_friend_access.module:75
+msgid "Yes"
+msgstr ""
+
+#: flag_friend_access.install:13
+msgid "The flag_friend_access module was successfully installed."
+msgstr ""
+
+#: flag_friend_access.install:22
+msgid "The flag_friend_access module was successfully uninstalled."
+msgstr ""
+
+#: flag_friend_access.info:0
+msgid "Flag friend access control"
+msgstr ""
+
+#: flag_friend_access.info:0
+msgid "Allows users to specify that only their friends can view this piece of content"
+msgstr ""
+
+#: flag_friend_access.info:0
+msgid "Flags"
+msgstr ""
+
