--- a/src/Form/SettingsForm.php	2017-10-04 21:57:16.000000000 +0300
+++ b/src/Form/SettingsForm.php	2018-01-04 19:54:13.444250434 +0200
@@ -3,6 +3,7 @@
 namespace Drupal\salesforce\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\salesforce\Rest\RestClientInterface;
@@ -23,24 +24,36 @@
   protected $sf_client;
 
   /**
-   * The sevent dispatcher service..
+   * The event dispatcher service.
    *
    * @var \Drupal\Core\State\StateInterface
    */
   protected $eventDispatcher;
 
   /**
+   * The module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
    * Constructs a \Drupal\system\ConfigFormBase object.
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
    * @param \Drupal\salesforce\Rest\RestClientInterface $salesforce_client
    *   The factory for configuration objects.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
+   *   The event dispatcher.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, RestClientInterface $salesforce_client, EventDispatcherInterface $event_dispatcher) {
+  public function __construct(ConfigFactoryInterface $config_factory, RestClientInterface $salesforce_client, EventDispatcherInterface $event_dispatcher, ModuleHandlerInterface $module_handler) {
     parent::__construct($config_factory);
     $this->sf_client = $salesforce_client;
     $this->eventDispatcher = $event_dispatcher;
+    $this->moduleHandler = $module_handler;
   }
 
   /**
@@ -50,7 +63,8 @@
     return new static(
       $container->get('config.factory'),
       $container->get('salesforce.client'),
-      $container->get('event_dispatcher')
+      $container->get('event_dispatcher'),
+      $container->get('module_handler')
     );
   }
 
@@ -131,27 +145,29 @@
       '#default_value' => $config->get('show_all_objects'),
     ];
 
-    $form['standalone'] = [
-      '#title' => $this->t('Standalone Push Processing'),
-      '#description' => $this->t('Enable standalone push processing, and do not process push mappings during cron. Note: when enabled, you must set up your own service to query this endpoint.'),
-      '#type' => 'checkbox',
-      '#default_value' => $config->get('standalone'),
-    ];
+    if ($this->moduleHandler->moduleExists('salesforce_push')) {
+      $form['standalone'] = [
+        '#title' => $this->t('Standalone Push Processing'),
+        '#description' => $this->t('Enable standalone push processing, and do not process push mappings during cron. Note: when enabled, you must set up your own service to query this endpoint.'),
+        '#type' => 'checkbox',
+        '#default_value' => $config->get('standalone'),
+      ];
 
-    $standalone_url = Url::fromRoute(
+      $standalone_url = Url::fromRoute(
         'salesforce_push.endpoint',
         ['key' => \Drupal::state()->get('system.cron_key')],
         ['absolute' => TRUE]);
-    $form['standalone_url'] = [
-      '#type' => 'item',
-      '#title' => $this->t('Standalone URL'),
-      '#markup' => $this->t('<a href="@url">@url</a>', ['@url' => $standalone_url->toString()]),
-      '#states' => [
-        'visible' => [
-          ':input#edit-standalone' => ['checked' => TRUE],
+      $form['standalone_url'] = [
+        '#type' => 'item',
+        '#title' => $this->t('Standalone URL'),
+        '#markup' => $this->t('<a href="@url">@url</a>', ['@url' => $standalone_url->toString()]),
+        '#states' => [
+          'visible' => [
+            ':input#edit-standalone' => ['checked' => TRUE],
+          ],
         ],
-      ],
-    ];
+      ];
+    }
 
     $form = parent::buildForm($form, $form_state);
     $form['creds']['actions'] = $form['actions'];