diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index 993f3ff197fda..296d62f9ac3ae 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2017 Adobe
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Block\Address;
 
 use Magento\Customer\Api\AddressMetadataInterface;
@@ -244,9 +246,37 @@ public function getBackUrl()
      */
     public function getSaveUrl()
     {
+        return $this->getSaveUrlWithParams();
+    }
+
+    /**
+     * Return the Url for saving with parameters.
+     *
+     * @param int $defaultShipping Default shipping flag
+     * @param int $defaultBilling Default billing flag
+     * @return string
+     */
+    public function getSaveUrlWithParams($defaultShipping = 0, $defaultBilling = 0)
+    {
+        $queryParams = ['_secure' => true];
+
+        // Consolidate $defaultShipping and $defaultBilling conditions
+        if ($defaultShipping == 1) {
+            $queryParams['default_shipping'] = 1;
+        }
+        if ($defaultBilling == 1) {
+            $queryParams['default_billing'] = 1;
+        }
+
+        // Add 'id' parameter only if the address is not both default billing and shipping
+        if (!$this->getAddress()->isDefaultBilling() || !$this->getAddress()->isDefaultShipping()) {
+            $queryParams['id'] = $this->getAddress()->getId();
+        }
+
+        // URL construction remains in a single block
         return $this->_urlBuilder->getUrl(
             'customer/address/formPost',
-            ['_secure' => true, 'id' => $this->getAddress()->getId()]
+            $queryParams
         );
     }
 
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
index d306e8c7c734f..dfe49859159f2 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2017 Adobe
  * See COPYING.txt for license details.
  */
 
@@ -8,13 +8,15 @@
 ?>
 <div class="block block-dashboard-addresses">
     <div class="block-title">
-        <strong><?= $block->escapeHtml(__('Address Book')) ?></strong>
-        <a class="action edit" href="<?= $block->escapeUrl($block->getAddressBookUrl()) ?>"><span><?= $block->escapeHtml(__('Manage Addresses')) ?></span></a>
+        <strong><?= $escaper->escapeHtml(__('Address Book')) ?></strong>
+        <a class="action edit" href="<?= $escaper->escapeUrl($block->getAddressBookUrl()) ?>">
+            <span><?= $escaper->escapeHtml(__('Manage Addresses')) ?></span>
+        </a>
     </div>
     <div class="block-content">
         <div class="box box-billing-address">
             <strong class="box-title">
-                <span><?= $block->escapeHtml(__('Default Billing Address')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Default Billing Address')) ?></span>
             </strong>
             <div class="box-content">
                 <address>
@@ -22,12 +24,17 @@
                 </address>
             </div>
             <div class="box-actions">
-                <a class="action edit" href="<?= $block->escapeUrl($block->getPrimaryBillingAddressEditUrl()) ?>" data-ui-id="default-billing-edit-link"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
+                <a 
+                class="action edit" 
+                href="<?= $escaper->escapeUrl($block->getPrimaryBillingAddressEditUrl() . '?billingAddress') ?>" 
+                data-ui-id="default-billing-edit-link">
+                    <span><?= $escaper->escapeHtml(__('Edit Billing Address')) ?></span>
+                </a>
             </div>
         </div>
         <div class="box box-shipping-address">
             <strong class="box-title">
-                <span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Default Shipping Address')) ?></span>
             </strong>
             <div class="box-content">
                 <address>
@@ -35,7 +42,12 @@
                 </address>
             </div>
             <div class="box-actions">
-                <a class="action edit" href="<?= $block->escapeUrl($block->getPrimaryShippingAddressEditUrl()) ?>" data-ui-id="default-shipping-edit-link"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
+                <a
+                class="action edit"
+                href="<?= $escaper->escapeUrl($block->getPrimaryShippingAddressEditUrl() . '?shippingAddress') ?>"
+                data-ui-id="default-shipping-edit-link">
+                    <span><?= $escaper->escapeHtml(__('Edit Shipping Address')) ?></span>
+                </a>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index e8fad1fe778db..e0c71eff05fbf 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2017 Adobe
  * All Rights Reserved.
@@ -22,7 +23,9 @@
                 </div>
                 <div class="box-actions">
                     <a class="action edit"
-                       href="<?= $escaper->escapeUrl($block->getAddressEditUrl($defaultBillingAddress)) ?>">
+                        href="
+                        <?= $escaper->escapeUrl($block->getAddressEditUrl($defaultBillingAddress) . '?billingAddress')
+                        ?>">
                         <span><?= $escaper->escapeHtml(__('Change Billing Address')) ?></span>
                     </a>
                 </div>
@@ -50,7 +53,9 @@
                 </div>
                 <div class="box-actions">
                     <a class="action edit"
-                       href="<?= $escaper->escapeUrl($block->getAddressEditUrl($defaultShippingAddress)) ?>">
+                    href="
+                    <?= $escaper->escapeUrl($block->getAddressEditUrl($defaultShippingAddress) . '?shippingAddress') ?>
+                    ">
                         <span><?= $escaper->escapeHtml(__('Change Shipping Address')) ?></span>
                     </a>
                 </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index a958f831e18a8..67f3c201a72b7 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2017 Adobe
  * See COPYING.txt for license details.
  */
 
@@ -12,6 +12,10 @@
 $viewModel = $block->getViewModel();
 $regionProvider = $block->getRegionProvider();
 ?>
+<?php 
+$defaultShipping = ($block->getRequest()->getParam('shippingAddress') !== null) ? 1 : 0;
+$defaultBilling = ($block->getRequest()->getParam('billingAddress') !== null) ? 1 : 0;
+?>
 <?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
 <?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
 <?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
@@ -31,11 +35,11 @@ $regionProvider = $block->getRegionProvider();
     trim(str_replace('required-entry', '', $_streetValidationClass)) : ''; ?>
 <?php $_regionValidationClass = $viewModel->addressGetAttributeValidationClass('region'); ?>
 <form class="form-address-edit"
-      action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>"
-      method="post"
-      id="form-validate"
-      enctype="multipart/form-data"
-      data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
+        action="<?= $escaper->escapeUrl($block->getSaveUrlWithParams($defaultShipping, $defaultBilling)) ?>"
+        method="post"
+        id="form-validate"
+        enctype="multipart/form-data"
+        data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
     <fieldset class="fieldset">
         <legend class="legend"><span><?= $escaper->escapeHtml(__('Contact Information')) ?></span></legend><br>
         <?= $block->getBlockHtml('formkey') ?>