diff --git web/sites/all/modules/contrib/flag_friend/flag_friend_access/flag_friend_access.module web/sites/all/modules/contrib/flag_friend/flag_friend_access/flag_friend_access.module
index 6d76509..ea41798 100644
--- web/sites/all/modules/contrib/flag_friend/flag_friend_access/flag_friend_access.module
+++ web/sites/all/modules/contrib/flag_friend/flag_friend_access/flag_friend_access.module
@@ -86,6 +86,8 @@ function flag_friend_access_property($node, array $options, $name, $entity_type)
  * Implements hook_form_alter().
  */
 function flag_friend_access_form_alter(&$form, &$form_state, $form_id) {
+  global $user;
+
   // add in a checkbox only if the
   if (isset($form['#node']) && $form['#node']->type . '_node_form' == $form_id) {
     // We have a node form alter in our stuff.
@@ -94,14 +96,58 @@ function flag_friend_access_form_alter(&$form, &$form_state, $form_id) {
       '#title' => t('Friend Access Control'),
       '#collapsable' => FALSE,
     );
-    $nid = isset($form['#node']->nid) ? $form['#node']->nid : NULL;
-    $access_value = flag_friend_access_value($nid);
+
+    if (isset($form['#node']->nid)) {
+      $access_value = flag_friend_access_value($form['#node']->nid);
+    }
+    else {
+      $access_value = flag_friend_access_default($user);
+    }
     $form['flag_friend_control']['flag_friend_access'] = array(
       '#type' => 'checkbox',
       '#title' => t('Only My Friends'),
       '#default_value' => !empty($access_value),
     );
   }
+  elseif (($form_id == 'user_register_form' || $form_id == 'user_profile_form') && $form['#user_category'] == 'account') {
+    // Add default settings for flag access.
+    $form['flag_friend_control'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Content privacy'),
+      '#collapsible' => TRUE,
+      '#collapsed' => FALSE,
+      '#weight' => 11,
+    );
+    $form['flag_friend_control']['flag_friend_access_default'] = array(
+      '#type' => 'radios',
+      '#options' => array(
+        '0' => t('All Users (default)'),
+        '1' => t('Only My Friends'),
+      ),
+      '#default_value' => flag_friend_access_default($form_state['user']),
+      '#description' => t('Choose who can see your content by default. You can change this on each post.'),
+    );
+  }
+}
+
+/**
+ * Implements hook_user_presave().
+ */
+function flag_friend_access_user_presave(&$edit, $account, $category) {
+  if (isset($edit['flag_friend_access_default'])) {
+    $edit['data']['flag_friend_access_default'] = $edit['flag_friend_access_default'];
+  }
+}
+
+/**
+ * Helper function to ensure a valid default for access.
+ */
+function flag_friend_access_default($account) {
+  $flag_friend_access_default = 0;
+  if (isset($account->data['flag_friend_access_default'])) {
+    $flag_friend_access_default = $account->data['flag_friend_access_default'];
+  }
+  return $flag_friend_access_default;
 }

 /**
@@ -110,19 +156,12 @@ function flag_friend_access_form_alter(&$form, &$form_state, $form_id) {
  * @param $nid
  *   Node id of the node to check.
  *
- * @param $reset = FALSE
- *  Whether or not to reset the static cache.
- *
  * @return
  *   User id.
  *
  */
-function flag_friend_access_value($nid, $reset = FALSE) {
-  static $nodes = array();
-
-  if ($reset) {
-    $nodes = array();
-  }
+function flag_friend_access_value($nid) {
+  $nodes = &drupal_static(__FUNCTION__, array());

   if (!isset($nodes[$nid])) {
     $nodes[$nid] = db_query('SELECT uid FROM {flag_friend_access} WHERE nid = :nid', array(':nid' => $nid))->fetchField();

