diff --git a/company.py b/company.py
index ebee550212..6b8967e074 100644
--- a/company.py
+++ b/company.py
@@ -188,6 +188,10 @@ class Property(ModelSQL, ModelView):
     def _set_values(self, cursor, user_id, name, model, res_id, val, field_id,
             context=None):
         user_obj = self.pool.get('res.user')
+        if context is None:
+            context = {}
+        if user_id == 0:
+            user_id = context.get('user', user_id)
         user = user_obj.browse(cursor, user_id, user_id, context=context)
         res = super(Property, self)._set_values(cursor, user_id, name, model,
                 res_id, val, field_id, context=context)