diff --git a/includes/fboauth.fboauth.inc b/includes/fboauth.fboauth.inc
index 77960f0..92f6458 100644
--- a/includes/fboauth.fboauth.inc
+++ b/includes/fboauth.fboauth.inc
@@ -142,11 +142,19 @@ function fboauth_action_deauth($app_id, $access_token) {
 /**
  * Given a Facebook user object, associate or save a Drupal user account.
  */
-function fboauth_create_user($fbuser) {
+function fboauth_create_user($fbuser, $options = array()) {
+  // Set default options.
+  $defaults = array(
+    'username' => variable_get('fboauth_user_username', 'username'),
+    'picture' => (variable_get('user_pictures', 0) && variable_get('fboauth_user_picture', 'picture')) ? 'picture' : '',
+    'status' => variable_get('user_register', 1) == 1 ? 1 : 0,
+  );
+  $options += $defaults;
+
   // Use their Facebook user name (if defined), otherwise their real name.
   // If an account already exists with that name, increment until the namespace
   // is available.
-  if (variable_get('fboauth_user_username', 'username') == 'username' && !empty($fbuser->username)) {
+  if ($options['username'] === 'username' && !empty($fbuser->username)) {
     $username = $fbuser->username;
   }
   else {
@@ -169,7 +177,7 @@ function fboauth_create_user($fbuser) {
     'mail' => !empty($fbuser->email) ? $fbuser->email : '',
     'init' => !empty($fbuser->email) ? $fbuser->email : '',
     // If user_register is "1", then no approval required.
-    'status' => variable_get('user_register', 1) == 1 ? 1 : 0,
+    'status' => $options['status'],
     'timezone' => variable_get('date_default_timezone'), // TODO: is this appropriate in sites with no default?
     'fboauth' => TRUE, // Signify this is being imported by Facebook OAuth.
     'fboauth_fbid' => $fbuser->id, // So that other modules can load the account.
@@ -194,7 +202,7 @@ function fboauth_create_user($fbuser) {
   $account = user_save(NULL, $edit);
 
   // Retrieve the user's picture from Facebook and save it locally.
-  if ($account->uid && variable_get('user_pictures', 0)) {
+  if ($account->uid && $options['picture'] === 'picture') {
     $picture_directory =  file_default_scheme() . '://' . variable_get('user_picture_path', 'pictures');
     if(file_prepare_directory($picture_directory, FILE_CREATE_DIRECTORY)){
       $picture_result = drupal_http_request('https://graph.facebook.com/' . $fbuser->id . '/picture?type=large');
diff --git a/includes/fboauth.pages.inc b/includes/fboauth.pages.inc
index 4799573..dc37e44 100644
--- a/includes/fboauth.pages.inc
+++ b/includes/fboauth.pages.inc
@@ -40,6 +40,15 @@ function fboauth_settings_form($form, &$form_state) {
     '#default_value' => variable_get('fboauth_user_email', TRUE),
   );
 
+  $form['fboauth_basic_mapping']['fboauth_user_picture'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Import Facebook user picture'),
+    '#description' => t('Import the Facebook picture to the built-in user picture.'),
+    '#default_value' => variable_get('fboauth_user_picture', 'picture') === 'picture',
+    '#return_value' => 'picture',
+    '#access' => variable_get('user_pictures', 0),
+  );
+
   $form['fboauth_basic_mapping']['fboauth_user_username'] = array(
     '#type' => 'radios',
     '#title' => t('User name import'),
@@ -103,7 +112,7 @@ function fboauth_settings_form($form, &$form_state) {
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
-    '#weight' => 50,
+    '#weight' => 100,
   );
 
   return $form;
@@ -135,6 +144,7 @@ function fboauth_settings_form_submit($form, &$form_state) {
 
   variable_set('fboauth_user_email', $form_state['values']['fboauth_user_email']);
   variable_set('fboauth_user_username', $form_state['values']['fboauth_user_username']);
+  variable_set('fboauth_user_picture', $form_state['values']['fboauth_user_picture']);
 
   // Save profile module values.
   if (module_exists('profile')) {