app-functions-fn.cart.php.diff

diff --git a/app/functions/fn.cart.php b/app/functions/fn.cart.php
index e9f58a930c..c2c05533b1 100644
--- a/app/functions/fn.cart.php
+++ b/app/functions/fn.cart.php
@@ -10437,7 +10437,7 @@ function fn_filter_order_user_data($user_data)
     }, $user_data);
     $result = array();
     $fields = db_get_fields(
-        "SELECT field_name FROM ?:profile_fields WHERE (checkout_show = 'Y' OR is_default = 'Y') AND field_name != ''"
+        "SELECT field_name FROM ?:profile_fields WHERE checkout_show = 'Y' AND is_default = 'Y' AND field_name != ''"
     );
 
     // Special order fields
@@ -10578,7 +10578,7 @@ function fn_checkout_update_user_data(&$cart, $auth, $user_data, $ship_to_anothe
     $profile_fields = fn_get_profile_fields('O');
     fn_convert_profile_dates_to_timestamps($user_data, $profile_fields);
 
-    if ($ship_to_another) {
+    if (!$ship_to_another) {
         fn_fill_address($user_data, $profile_fields);
     }
 

app-functions-fn.users.php.diff

diff --git a/app/functions/fn.users.php b/app/functions/fn.users.php
index 0cd5dc7b57..3a07d8b126 100644
--- a/app/functions/fn.users.php
+++ b/app/functions/fn.users.php
@@ -107,7 +107,7 @@ function fn_get_user_info($user_id, $get_profile = true, &$profile_id = null)
     $user_data['fields'] = fn_get_profile_fields_data(ProfileDataTypes::USER, $user_id);
 
     if ($get_profile && !empty($profile_data['profile_id'])) {
-        $user_data['fields'] += fn_get_profile_fields_data(ProfileDataTypes::PROFILE, $profile_data['profile_id']);
+        $user_data['fields'] = fn_get_profile_fields_data(ProfileDataTypes::PROFILE, $profile_data['profile_id']) + $user_data['fields'];
     }
 
     fn_add_user_data_descriptions($user_data);