--- a/sites/all/modules/contrib/salesforce/modules/salesforce_mapping/includes/salesforce_mapping.admin.inc
+++ b/sites/all/modules/contrib/salesforce/modules/salesforce_mapping/includes/salesforce_mapping.admin.inc
@@ -95,10 +95,13 @@ function salesforce_mapping_form($form, &$form_state, SalesforceMapping $mapping
   $sfobjects = & $form_state['sf_objects'];
   if (!$sfobjects) {
     // Note that we're filtering SF object types to a reasonable subset.
-    $sfobjects = $sfapi->objects(array(
-      'updateable' => TRUE,
+    $sf_object_filter = array(
       'triggerable' => TRUE,
-    ));
+    );
+    if (module_exists('salesforce_push')) {
+      $sf_object_filter['updateable'] = TRUE;
+    }
+    $sfobjects = $sfapi->objects($sf_object_filter);
     $form_state['sf_objects'] = $sfobjects;
   }
 
@@ -231,6 +234,17 @@ function salesforce_mapping_form($form, &$form_state, SalesforceMapping $mapping
           }
         }
       }
+      
+      $direction_options = array();
+      
+      if (module_exists('salesforce_pull')) {
+        $direction_options[SALESFORCE_MAPPING_DIRECTION_SF_DRUPAL] = t('SF to Drupal');
+      }
+      
+      if (module_exists('salesforce_push')) {
+        $direction_options[SALESFORCE_MAPPING_DIRECTION_DRUPAL_SF] = t('Drupal to SF');
+        $direction_options[SALESFORCE_MAPPING_DIRECTION_SYNC] = t('Sync');
+      }
 
       $form['salesforce_field_mappings_wrapper']['salesforce_field_mappings'][$delta] = array(
         'drupal_field' => array(
@@ -261,13 +275,9 @@ function salesforce_mapping_form($form, &$form_state, SalesforceMapping $mapping
         ),
         'direction' => array(
           '#type' => 'radios',
-          '#options' => array(
-            SALESFORCE_MAPPING_DIRECTION_DRUPAL_SF => t('Drupal to SF'),
-            SALESFORCE_MAPPING_DIRECTION_SF_DRUPAL => t('SF to Drupal'),
-            SALESFORCE_MAPPING_DIRECTION_SYNC => t('Sync'),
-          ),
+          '#options' => $direction_options,
           '#required' => TRUE,
-          '#default_value' => isset($mapping->field_mappings[$delta]) ? $mapping->field_mappings[$delta]['direction'] : SALESFORCE_MAPPING_DIRECTION_SYNC,
+          '#default_value' => isset($mapping->field_mappings[$delta]) ? $mapping->field_mappings[$delta]['direction'] : end($direction_options),
         ),
         'delete_field_mapping' => array(
           '#type' => 'checkbox',