diff --git a/bin/addons/base/res/ir_property.py b/bin/addons/base/res/ir_property.py
index 462cb433998..8dcd01c4897 100644
--- a/bin/addons/base/res/ir_property.py
+++ b/bin/addons/base/res/ir_property.py
@@ -165,7 +165,7 @@ class ir_property(osv.osv):
 
         return False
 
-    def get(self, cr, uid, name, model, res_id=False, context=None):
+    def get(self, cr, uid, name, model, res_id=False, context={}):
         domain = self._get_domain(cr, uid, name, model, context=context)
         if domain is not None:
             domain = [('res_id', '=', res_id)] + domain
@@ -180,6 +180,7 @@ class ir_property(osv.osv):
         return ['&', ('res_id', '=', False)] + domain
 
     def _get_domain(self, cr, uid, prop_name, model, context=None):
+        context = context or {}
         cr.execute('select id from ir_model_fields where name=%s and model=%s', (prop_name, model))
         res = cr.fetchone()
         if not res:
@@ -189,8 +190,7 @@ class ir_property(osv.osv):
             cid = context['force_company']
         else:
             company = self.pool.get('res.company')
-            cid = company._company_default_get(cr, uid, model, res[0],
-                                           context=context)
+            cid = company._company_default_get(cr, uid, model, res[0], context=context)
 
         domain = ['&', ('fields_id', '=', res[0]),
                   '|', ('company_id', '=', cid), ('company_id', '=', False)]
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 6cad8d1aa81..cc786ac526a 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -393,8 +393,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[('supplier','=',1)]</field>
-            <field name="context">{'default_customer':0, 'default_supplier':1}</field>
+            <field name="domain">[]</field>
+            <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1}</field>
             <field name="filter" eval="True"/>
         </record>