diff --git a/uc_cart/config/uc_cart.settings.yml b/uc_cart/config/uc_cart.settings.yml
index ca6492d..fe19640 100644
--- a/uc_cart/config/uc_cart.settings.yml
+++ b/uc_cart/config/uc_cart.settings.yml
@@ -29,7 +29,6 @@ checkout_email_admin: true
 mail_existing: true
 email_validation: false
 
-default_same_address: false
 checkout_anonymous: true
 checkout_complete_page: ''
 checkout_enabled: true
diff --git a/uc_cart/lib/Drupal/uc_cart/Form/CheckoutSettingsForm.php b/uc_cart/lib/Drupal/uc_cart/Form/CheckoutSettingsForm.php
index ab30eb1..21d3431 100644
--- a/uc_cart/lib/Drupal/uc_cart/Form/CheckoutSettingsForm.php
+++ b/uc_cart/lib/Drupal/uc_cart/Form/CheckoutSettingsForm.php
@@ -198,11 +198,6 @@ class CheckoutSettingsForm extends ConfigFormBase {
       }
     }
 
-    $form['checkout']['uc_cart_default_same_address'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use the same address for billing and delivery by default.'),
-      '#default_value' => $cart_config->get('default_same_address'),
-    );
     $form['checkout']['uc_cart_delivery_not_shippable'] = array(
       '#type' => 'checkbox',
       '#title' => t('Hide delivery information when carts have no shippable items.'),
@@ -286,7 +281,6 @@ class CheckoutSettingsForm extends ConfigFormBase {
       ->set('new_customer_email', $form_state['values']['uc_new_customer_email'])
       ->set('new_customer_login', $form_state['values']['uc_new_customer_login'])
       ->set('new_customer_status_active', $form_state['values']['uc_new_customer_status_active'])
-      ->set('default_same_address', $form_state['values']['uc_cart_default_same_address'])
       ->set('delivery_not_shippable', $form_state['values']['uc_cart_delivery_not_shippable'])
       ->set('checkout_complete_page', $form_state['values']['uc_cart_checkout_complete_page'])
       ->set('panes', $form_state['values']['panes'])
diff --git a/uc_cart/lib/Drupal/uc_cart/Plugin/Ubercart/CheckoutPane/AddressPaneBase.php b/uc_cart/lib/Drupal/uc_cart/Plugin/Ubercart/CheckoutPane/AddressPaneBase.php
index 9d8978d..dbffc01 100644
--- a/uc_cart/lib/Drupal/uc_cart/Plugin/Ubercart/CheckoutPane/AddressPaneBase.php
+++ b/uc_cart/lib/Drupal/uc_cart/Plugin/Ubercart/CheckoutPane/AddressPaneBase.php
@@ -42,7 +42,6 @@ abstract class AddressPaneBase extends CheckoutPanePluginBase {
    */
   public function view(UcOrderInterface $order, array $form, array &$form_state) {
     $user = \Drupal::currentUser();
-    $cart_config = \Drupal::config('uc_cart.settings');
     $pane = $this->pluginDefinition['id'];
     $source = $this->sourcePaneId();
 
@@ -52,7 +51,7 @@ abstract class AddressPaneBase extends CheckoutPanePluginBase {
       $contents['copy_address'] = array(
         '#type' => 'checkbox',
         '#title' => $this->getCopyAddressText(),
-        '#default_value' => $cart_config->get('default_same_address'),
+        '#default_value' => $this->configuration['default_same_address'],
         '#ajax' => array(
           'callback' => array($this, 'ajaxRender'),
           'wrapper' => $pane . '-address-pane',
@@ -94,7 +93,7 @@ abstract class AddressPaneBase extends CheckoutPanePluginBase {
       $contents['address']['#hidden'] = !empty($form_state['values']['panes'][$pane]['copy_address']);
     }
     elseif (isset($contents['copy_address'])) {
-      $contents['address']['#hidden'] = $cart_config->get('default_same_address');
+      $contents['address']['#hidden'] = $this->configuration['default_same_address'];
     }
 
     if (isset($form_state['triggering_element'])) {
@@ -173,6 +172,29 @@ abstract class AddressPaneBase extends CheckoutPanePluginBase {
   }
 
   /**
+   * {@inheritdoc}
+   */
+  public function settingsForm() {
+    if ($this->sourcePaneId() != $this->pluginDefinition['id']) {
+      $form['default_same_address'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Use the same address for billing and delivery by default.'),
+        '#default_value' => $this->configuration['default_same_address'],
+      );
+      return $form;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    return array(
+      'default_same_address' => TRUE,
+    );
+  }
+
+  /**
    * Ajax callback to re-render the full address element.
    */
   function ajaxRender($form, &$form_state) {