--- salesforce_api/salesforce_api.admin.inc.orig	2009-07-31 03:04:05.000000000 -0500
+++ salesforce_api/salesforce_api.admin.inc	2009-09-18 16:57:19.000000000 -0500
@@ -163,13 +163,6 @@
     '#disabled' => count($options) == 0,
     '#required' => TRUE,
   );
-  $form['automatic'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Automatically Populate Salesforce?'),
-    '#return_value' => 1,
-    '#default_value' => 1,
-    '#description' => t('Automatically create and link new salesforce objects when Drupal objects are created?'),
-  );
 
   $form['submit'] = array(
     '#type' => 'submit',
@@ -291,6 +284,14 @@
     drupal_goto(SALESFORCE_PATH_FIELDMAPS);
   }
 
+  $form['drupal_sfapi_automatic'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Automatically Populate Salesforce?'),
+    '#return_value' => 1,
+    '#default_value' => $map['automatic'],
+    '#description' => t('Automatically create and link new salesforce objects when Drupal objects are created?'),
+  );
+
   // Add the data to the form for the required fields table.
   $form['fields'] = array(
     '#theme' => 'salesforce_api_fieldmap_edit_form_table',
@@ -374,6 +375,9 @@
     }
   }
 
+  // set the automatic flag on the map
+  $map['automatic'] = $form_state['values']['drupal_sfapi_automatic'];
+  
   // Save the updated fieldmap.
   salesforce_api_fieldmap_save($map);