diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py
index fa9c4e7a660..d66b55add50 100644
--- a/addons/payment_paypal/models/paypal.py
+++ b/addons/payment_paypal/models/paypal.py
@@ -119,8 +119,8 @@ class AcquirerPaypal(osv.Model):
             'currency_code': tx_values['currency'] and tx_values['currency'].name or '',
             'address1': partner_values['address'],
             'city': partner_values['city'],
-            'country': partner_values['country'] and partner_values['country'].name or '',
-            'state': partner_values['state'] and partner_values['state'].name or '',
+            'country': partner_values['country'] and partner_values['country'].code or '',
+            'state': partner_values['state'] and (partner_values['state'].code or partner_values['state'].name) or '',
             'email': partner_values['email'],
             'zip': partner_values['zip'],
             'first_name': partner_values['first_name'],