diff --git a/ttips/sites/all/modules/contrib/facebook_oauth_extras/fboauth_friends.module b/ttips/sites/all/modules/contrib/facebook_oauth_extras/fboauth_friends.module
index 781fc29..70c020d 100644
--- a/ttips/sites/all/modules/contrib/facebook_oauth_extras/fboauth_friends.module
+++ b/ttips/sites/all/modules/contrib/facebook_oauth_extras/fboauth_friends.module
@@ -142,7 +142,7 @@ function fboauth_friends_fboauth_action_connect($app_id, $access_token) {
       $account = user_load($account->uid);
 
       // TRIGGER ACTIONS.
-      fboauth_friends_trigger($app_id, $access_token);
+      fboauth_friends_trigger($app_id, $access_token, $account);
 
       // If the account requires administrator approval the new account will
       // have a status of '0' and not be activated yet.
@@ -167,27 +167,28 @@ function fboauth_friends_fboauth_action_connect($app_id, $access_token) {
   // For some reason, these don't after fboauth_create_user().
   // If the user is successfully connected, import friends.
   if ($fbid = fboauth_fbid_load($uid)) {
-    fboauth_friends_trigger($app_id, $access_token);
+    fboauth_friends_trigger($app_id, $access_token, $account);
   }
 }
 
 /**
  * Triggers all fboauth_friends custom actions.
  */
-function fboauth_friends_trigger($app_id, $access_token) {
+function fboauth_friends_trigger($app_id, $access_token, $account) {
   $_SESSION['fboauth_friends']['access_token'] = $access_token;
   if (variable_get('fboauth_friends_import', 1)) {
-    fboauth_friends_fboauth_action_friends_import($app_id, $access_token);
+    fboauth_friends_fboauth_action_friends_import($app_id, $access_token, $account);
   }
   if (variable_get('fboauth_picture_import', 0)) {
-    fboauth_friends_fboauth_action_picture_import($app_id, $access_token);
+    fboauth_friends_fboauth_action_picture_import($app_id, $access_token, $account);
   }
 }
 
 /**
  * Facebook OAuth action callback; Import a user's Facebook picture.
  */
-function fboauth_friends_fboauth_action_picture_import($app_id, $access_token) {
+function fboauth_friends_fboauth_action_picture_import($app_id, $access_token, $account) {
+  return;
   global $user;
   $fbuser = fboauth_graph_query('me', $access_token);
 
@@ -220,16 +221,14 @@ function fboauth_friends_fboauth_action_picture_import($app_id, $access_token) {
 /**
  * Facebook OAuth action callback; Import a user's Facebook friends.
  */
-function fboauth_friends_fboauth_action_friends_import($app_id, $access_token) {
-  global $user;
-
+function fboauth_friends_fboauth_action_friends_import($app_id, $access_token, $account) {
   // @todo Run only at admin specified intervals.
 
   $result = fboauth_graph_query('me/friends', $access_token);
   foreach ($result->data as $friend) {
     $name = explode(' ', $friend->name);
     $friends[$friend->id] = array(
-      'uid' => $user->uid,
+      'uid' => $account->uid,
       'fbid' => $friend->id,
       'name' => $friend->name,
       'first_name' => $name[0],
@@ -245,7 +244,7 @@ function fboauth_friends_fboauth_action_friends_import($app_id, $access_token) {
     // then build a multi-insert query.
     $query = db_select('fboauth_friends', 'fif')
       ->fields('fif', array('fbid', 'fbid'))
-      ->condition('uid', $user->uid)
+      ->condition('uid', $account->uid)
       ->condition('fbid', $fbids, 'IN');
     $existing_friends = $query->execute()->fetchAllKeyed();
 
@@ -270,7 +269,7 @@ function fboauth_friends_fboauth_action_friends_import($app_id, $access_token) {
               'last_name' => $record['last_name'],
               'changed' => REQUEST_TIME))
             ->condition('fbid', $record['fbid'])
-            ->condition('uid', $user->uid)
+            ->condition('uid', $account->uid)
             ->execute();
         }
       }