diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 8a2162f9f6a..aca486a4d48 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -285,8 +285,8 @@ class res_partner_address(osv.osv):
         'street2': fields.char('Street2', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),
         'city': fields.char('City', size=128),
-        'state_id': fields.many2one("res.country.state", 'Fed. State', change_default=True, domain="[('country_id','=',country_id)]"),
-        'country_id': fields.many2one('res.country', 'Country', change_default=True),
+        'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
+        'country_id': fields.many2one('res.country', 'Country'),
         'email': fields.char('E-Mail', size=240),
         'phone': fields.char('Phone', size=64),
         'fax': fields.char('Fax', size=64),