diff --git a/sites/all/modules/_store/commerce_paypal/modules/ec/commerce_paypal_ec.module b/sites/all/modules/_store/commerce_paypal/modules/ec/commerce_paypal_ec.module
index f6ea1b8..5023859 100644
--- a/sites/all/modules/_store/commerce_paypal/modules/ec/commerce_paypal_ec.module
+++ b/sites/all/modules/_store/commerce_paypal/modules/ec/commerce_paypal_ec.module
@@ -1390,6 +1390,13 @@ function commerce_paypal_ec_customer_profile($order, $profile_type, $response, $
     $address['first_name'] = $response['FIRSTNAME'];
     $address['last_name'] = $response['LASTNAME'];
     $address['name_line'] = $address['first_name'] . ' ' . $address['last_name'];
+
+    // Should not be dependent on the default country code of the site, user may be from
+    // a different country; I'm not sure though if it's safe to assume that the country
+    // where the Paypal user is from [COUNTRYCODE] is the billing info's country.
+    // If that's an incorrect assumption, we should at least override it with an empty string
+    // $address['country'] = '';
+    $address['country'] = $response['COUNTRYCODE'];
   }
   elseif ($profile_type == 'shipping') {
     // Otherwise if it's a shipping profile, populate the address with all of
