diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 8b1e633191f..275a7278a0c 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -78,7 +78,7 @@
                 <form string="Users">
                 	<notebook colspan="4">
                 		<page string="Current Activity">
-                    		<field name="company_id" widget="selection" readonly="0"/>
+                    		<field name="company_id" widget="selection" readonly="0" context="{'prefence_company':True}"/>
                     		<newline/>
                     		<separator colspan="4" string="Preferences"/>
                     	</page>
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 95d0b5685f3..5400c5f6459 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1076,6 +1076,7 @@ class orm_template(object):
                         if column._domain and not isinstance(column._domain, (str, unicode)):
                             dom = column._domain
                         dom += eval(node.get('domain','[]'), {'uid':user, 'time':time})
+                        context.update(eval(node.get('context','{}')))                        
                         attrs['selection'] = self.pool.get(relation).name_search(cr, user, '', dom, context=context)
                         if (node.get('required') and not int(node.get('required'))) or not column.required:
                             attrs['selection'].append((False,''))