app-controllers-frontend-checkout.php.diff

diff --git a/app/controllers/frontend/checkout.php b/app/controllers/frontend/checkout.php
index cdfa5e4aba..ea0d3f2b02 100644
--- a/app/controllers/frontend/checkout.php
+++ b/app/controllers/frontend/checkout.php
@@ -327,6 +327,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                 }
 
                 fn_checkout_set_cart_profile_id($cart, $auth, $profile_id);
+                $cart['user_data'] = array_merge($cart['user_data'], $selectable_profiles[$profile_id]);
             }
 
             list(, $redirect_params) = fn_checkout_update_steps($cart, $auth, $_REQUEST);
@@ -581,6 +582,8 @@ if ($mode === 'cart') {
             fn_checkout_set_cart_profile_id($cart, $auth, $profile_id);
         }
 
+        $cart['user_data'] = array_merge($cart['user_data'], $selectable_profiles[$profile_id]);
+
         list(, $redirect_params) = fn_checkout_update_steps($cart, $auth, []);
     }
 

design-themes-responsive-templates-views-checkout-components-customer-billing.tpl.diff

diff --git a/design/themes/responsive/templates/views/checkout/components/customer/billing.tpl b/design/themes/responsive/templates/views/checkout/components/customer/billing.tpl
index f6c1ddd988..328b4dd65f 100644
--- a/design/themes/responsive/templates/views/checkout/components/customer/billing.tpl
+++ b/design/themes/responsive/templates/views/checkout/components/customer/billing.tpl
@@ -36,7 +36,7 @@
     </div>
 </div>
 
-<div id="billing_address" class="litecheckout__container {if !$use_billing_address}hidden{/if}">
+<div class="litecheckout__container {if !$use_billing_address}hidden{/if}" id="billing_address">
     <div class="litecheckout__group">
         <input
             type="hidden"
@@ -46,6 +46,7 @@
             data-ca-lite-checkout-auto-save-on-change="true"
             {if !$use_billing_address}disabled="disabled"{/if}
         >
+
         {include
             file="views/checkout/components/profile_fields.tpl"
             profile_fields=$profile_fields
@@ -54,4 +55,4 @@
             exclude=["customer_notes"]
         }
     </div>
-</div>
+<!--billing_address--></div>

js-tygh-checkout-lite_checkout.js.diff

diff --git a/js/tygh/checkout/lite_checkout.js b/js/tygh/checkout/lite_checkout.js
index b257c3b088..828868d5c6 100644
--- a/js/tygh/checkout/lite_checkout.js
+++ b/js/tygh/checkout/lite_checkout.js
@@ -441,7 +441,7 @@
                 method: 'POST',
                 hidden: false,
                 caching: false,
-                result_ids: 'litecheckout_final_section,litecheckout_step_payment,shipping_rates_list,checkout*',
+                result_ids: 'litecheckout_final_section,litecheckout_step_payment,shipping_rates_list,billing_address,checkout*',
                 data: { profile_id: profileId, full_render: 'Y' },
             })
         },
@@ -478,7 +478,7 @@
                 data: data,
                 full_render: redraw,
                 result_ids: redraw ?
-                    'litecheckout_final_section,litecheckout_step_payment,shipping_rates_list,checkout*'
+                    'litecheckout_final_section,litecheckout_step_payment,shipping_rates_list,billing_address,checkout*'
                     : '',
                 callback: function (response) {
                     for (var i in response.notifications) {