diff --git a/example-templates/dist/shop/_private/address/fields.twig b/example-templates/dist/shop/_private/address/fields.twig
index d17b516d64..9f04efa630 100644
--- a/example-templates/dist/shop/_private/address/fields.twig
+++ b/example-templates/dist/shop/_private/address/fields.twig
@@ -2,6 +2,7 @@
 {#
 Outputs address form fields for editing an address.
 #}
+{% set showPrimaryCheckboxes = showPrimaryCheckboxes is defined ? showPrimaryCheckboxes : false %}
 {% set addressFieldLayout = craft.app.getAddresses().getLayout() %}
 {% set addressCustomFields = addressFieldLayout.getCustomFields()|filter(f => className(f) == 'craft\\fields\\PlainText') %}
 {# @var address \craft\elements\Address #}
@@ -193,9 +194,34 @@ Outputs address form fields for editing an address.
       {% endfor %}
     </div>
   {% endif %}
+
+  {% if showPrimaryCheckboxes %}
+    <hr class="my-2">
+    <div class="my-2">
+      {{ input('text', 'isPrimaryBilling', address.isPrimarybilling ? 1 : 0) }}
+      <label>{{ input('checkbox', 'isPrimaryBillingBox', 1, { checked: address.isPrimaryBilling, 'data-primary-input': 'isPrimaryBilling' }) }} {{ 'Use as the primary billing address'|t('commerce') }}</label>
+    </div>
+    <div class="my-2">
+      {{ input('text', 'isPrimaryShipping', address.isPrimaryShipping ? 1 : 0) }}
+      <label>{{ input('checkbox', 'isPrimaryShippingBox', 1, { checked: address.isPrimaryShipping, 'data-primary-input': 'isPrimaryShipping' }) }} {{ 'Use as the primary shipping address'|t('commerce') }}</label>
+    </div>
+  {% endif %}
 </div>
 
 {% js %}
+{% if showPrimaryCheckboxes %}
+document.querySelectorAll('input[type=checkbox][data-primary-input]').forEach(el => {
+    el.addEventListener('change', ev => {
+        let primaryInput = document.querySelector(`input[name="${ev.target.dataset.primaryInput}"]`);
+        if (ev.target.checked) {
+        primaryInput.value = 1;
+        } else {
+        primaryInput.value = 0;
+        }
+    });
+});
+{% endif %}
+
 document.querySelector('select#{{ 'countryCode'|namespaceInputId(addressName) }}').addEventListener('change', ev => {
   const countryCode = ev.target.value;
   const stateSelect = document.querySelector('select#{{ 'administrativeArea'|namespaceInputId(addressName) }}');
diff --git a/example-templates/dist/shop/checkout/addresses.twig b/example-templates/dist/shop/checkout/addresses.twig
index f7ab646ba8..e22bceb778 100644
--- a/example-templates/dist/shop/checkout/addresses.twig
+++ b/example-templates/dist/shop/checkout/addresses.twig
@@ -43,6 +43,17 @@ Outputs a form for collecting an order’s shipping and billing address.
             sourceIdName: 'sourceShippingAddressId',
           }) }}
 
+          {% if currentUser and addresses|length %}
+            <div class="mt-3">
+              <label>
+                {{ input('checkbox', 'makePrimaryShippingAddress', 1, {
+                  id: 'makePrimaryShippingAddress',
+                }) }}
+                {{ 'Make this my default shipping address'|t }}
+              </label>
+            </div>
+          {% endif %}
+
           <hr class="my-5">
 
           {{ hiddenInput('billingAddressSameAsShipping', 0) }}
@@ -57,17 +68,6 @@ Outputs a form for collecting an order’s shipping and billing address.
             </label>
           </div>
 
-          {% if currentUser %}
-          <div class="mt-3">
-            <label>
-              {{ input('checkbox', 'makePrimaryShippingAddress', 1, {
-                id: 'makePrimaryShippingAddress',
-              }) }}
-              {{ 'Make this my default shipping address'|t }}
-            </label>
-          </div>
-          {% endif %}
-
           <div class="mt-8">
             {{ include('shop/_private/address/fieldset', {
               title: 'Billing Address'|t,
@@ -78,19 +78,19 @@ Outputs a form for collecting an order’s shipping and billing address.
             }) }}
           </div>
 
-          <hr class="my-5">
-
-          {% if currentUser %}
-          <div class="mt-3">
-            <label>
-              {{ input('checkbox', 'makePrimaryBillingAddress', 1, {
-                id: 'makePrimaryBillingAddress',
-              }) }}
-              {{ 'Make this my default billing address'|t }}
-            </label>
-          </div>
+          {% if currentUser and addresses|length %}
+            <div class="mt-3">
+              <label>
+                {{ input('checkbox', 'makePrimaryBillingAddress', 1, {
+                  id: 'makePrimaryBillingAddress',
+                }) }}
+                {{ 'Make this my default billing address'|t }}
+              </label>
+            </div>
           {% endif %}
 
+          <hr class="my-5">
+
           <div class="mt-3 flex justify-end">
             {{ tag('button', {
               type: 'submit',
diff --git a/example-templates/dist/shop/customer/addresses/edit.twig b/example-templates/dist/shop/customer/addresses/edit.twig
index 24fea2362d..dabbcebd41 100644
--- a/example-templates/dist/shop/customer/addresses/edit.twig
+++ b/example-templates/dist/shop/customer/addresses/edit.twig
@@ -46,6 +46,7 @@
         {{ include('shop/_private/address/fields', {
             address: address,
             showLabelField: true,
+            showPrimaryCheckboxes: true,
         }) }}
         {{ hiddenInput('ownerId', currentUser.id) }}
 
diff --git a/example-templates/src/shop/_private/address/fields.twig b/example-templates/src/shop/_private/address/fields.twig
index 2021085cf8..2ae32496a0 100755
--- a/example-templates/src/shop/_private/address/fields.twig
+++ b/example-templates/src/shop/_private/address/fields.twig
@@ -2,6 +2,7 @@
 {#
 Outputs address form fields for editing an address.
 #}
+{% set showPrimaryCheckboxes = showPrimaryCheckboxes is defined ? showPrimaryCheckboxes : false %}
 {% set addressFieldLayout = craft.app.getAddresses().getLayout() %}
 {% set addressCustomFields = addressFieldLayout.getCustomFields()|filter(f => className(f) == 'craft\\fields\\PlainText') %}
 {# @var address \craft\elements\Address #}
@@ -193,9 +194,34 @@ Outputs address form fields for editing an address.
       {% endfor %}
     </div>
   {% endif %}
+
+  {% if showPrimaryCheckboxes %}
+    <hr class="my-2">
+    <div class="my-2">
+      {{ input('text', 'isPrimaryBilling', address.isPrimarybilling ? 1 : 0) }}
+      <label>{{ input('checkbox', 'isPrimaryBillingBox', 1, { checked: address.isPrimaryBilling, 'data-primary-input': 'isPrimaryBilling' }) }} {{ 'Use as the primary billing address'|t('commerce') }}</label>
+    </div>
+    <div class="my-2">
+      {{ input('text', 'isPrimaryShipping', address.isPrimaryShipping ? 1 : 0) }}
+      <label>{{ input('checkbox', 'isPrimaryShippingBox', 1, { checked: address.isPrimaryShipping, 'data-primary-input': 'isPrimaryShipping' }) }} {{ 'Use as the primary shipping address'|t('commerce') }}</label>
+    </div>
+  {% endif %}
 </div>
 
 {% js %}
+{% if showPrimaryCheckboxes %}
+document.querySelectorAll('input[type=checkbox][data-primary-input]').forEach(el => {
+    el.addEventListener('change', ev => {
+        let primaryInput = document.querySelector(`input[name="${ev.target.dataset.primaryInput}"]`);
+        if (ev.target.checked) {
+        primaryInput.value = 1;
+        } else {
+        primaryInput.value = 0;
+        }
+    });
+});
+{% endif %}
+
 document.querySelector('select#{{ 'countryCode'|namespaceInputId(addressName) }}').addEventListener('change', ev => {
   const countryCode = ev.target.value;
   const stateSelect = document.querySelector('select#{{ 'administrativeArea'|namespaceInputId(addressName) }}');
diff --git a/example-templates/src/shop/checkout/addresses.twig b/example-templates/src/shop/checkout/addresses.twig
index aa242e3f8f..30e395057d 100755
--- a/example-templates/src/shop/checkout/addresses.twig
+++ b/example-templates/src/shop/checkout/addresses.twig
@@ -43,6 +43,17 @@ Outputs a form for collecting an order’s shipping and billing address.
             sourceIdName: 'sourceShippingAddressId',
           }) }}
 
+          {% if currentUser and addresses|length %}
+            <div class="mt-3">
+              <label>
+                {{ input('checkbox', 'makePrimaryShippingAddress', 1, {
+                  id: 'makePrimaryShippingAddress',
+                }) }}
+                {{ 'Make this my default shipping address'|t }}
+              </label>
+            </div>
+          {% endif %}
+
           <hr class="my-5">
 
           {{ hiddenInput('billingAddressSameAsShipping', 0) }}
@@ -57,17 +68,6 @@ Outputs a form for collecting an order’s shipping and billing address.
             </label>
           </div>
 
-          {% if currentUser %}
-          <div class="mt-3">
-            <label>
-              {{ input('checkbox', 'makePrimaryShippingAddress', 1, {
-                id: 'makePrimaryShippingAddress',
-              }) }}
-              {{ 'Make this my default shipping address'|t }}
-            </label>
-          </div>
-          {% endif %}
-
           <div class="mt-8">
             {{ include('[[folderName]]/_private/address/fieldset', {
               title: 'Billing Address'|t,
@@ -78,19 +78,19 @@ Outputs a form for collecting an order’s shipping and billing address.
             }) }}
           </div>
 
-          <hr class="my-5">
-
-          {% if currentUser %}
-          <div class="mt-3">
-            <label>
-              {{ input('checkbox', 'makePrimaryBillingAddress', 1, {
-                id: 'makePrimaryBillingAddress',
-              }) }}
-              {{ 'Make this my default billing address'|t }}
-            </label>
-          </div>
+          {% if currentUser and addresses|length %}
+            <div class="mt-3">
+              <label>
+                {{ input('checkbox', 'makePrimaryBillingAddress', 1, {
+                  id: 'makePrimaryBillingAddress',
+                }) }}
+                {{ 'Make this my default billing address'|t }}
+              </label>
+            </div>
           {% endif %}
 
+          <hr class="my-5">
+
           <div class="mt-3 flex justify-end">
             {{ tag('button', {
               type: 'submit',
diff --git a/example-templates/src/shop/customer/addresses/edit.twig b/example-templates/src/shop/customer/addresses/edit.twig
index 1108ee7c51..c0b771ef37 100644
--- a/example-templates/src/shop/customer/addresses/edit.twig
+++ b/example-templates/src/shop/customer/addresses/edit.twig
@@ -46,6 +46,7 @@
         {{ include('[[folderName]]/_private/address/fields', {
             address: address,
             showLabelField: true,
+            showPrimaryCheckboxes: true,
         }) }}
         {{ hiddenInput('ownerId', currentUser.id) }}
 
diff --git a/src/services/PaymentSources.php b/src/services/PaymentSources.php
index 530f2ed175..62925919fc 100644
--- a/src/services/PaymentSources.php
+++ b/src/services/PaymentSources.php
@@ -284,7 +284,7 @@ public function createPaymentSource(int $customerId, GatewayInterface $gateway,
             throw new PaymentSourceException(Craft::t('commerce', 'Could not create the payment source.'));
         }
 
-        if($makePrimarySource) {
+        if ($makePrimarySource) {
             Plugin::getInstance()->getCustomers()->savePrimaryPaymentSourceId($source->getCustomer(), $source->id);
         }