diff --git a/addons/project/project.py b/addons/project/project.py
index 4567ba1c4b0..dabed700baf 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -507,12 +507,20 @@ class message(osv.osv):
         }
 message()
 
+def _project_get(self, cr, uid, context={}):
+    obj = self.pool.get('project.project')
+    ids = obj.search(cr, uid, [])
+    res = obj.read(cr, uid, ids, ['id','name'], context)
+    res = [(str(r['id']),r['name']) for r in res]
+    return res
+
 class users(osv.osv):
     _inherit = 'res.users'
-    _description ="User"
+    _description = "Users"
     _columns = {
-        'project_id': fields.many2one('project.project', 'Project'),
+        'context_project_id': fields.selection(_project_get, 'Project'),
         }
 
 users()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3b4eee97adc..6590c86d827 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -670,7 +670,7 @@ menu_main
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <field name="password" position="after">
-                 <field name="project_id" widget="selection" />
+                 <field name="context_project_id" completion="1"/>
                 </field>
             </field>
         </record>
@@ -680,9 +680,10 @@ menu_main
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form_simple_modif" />
             <field name="type">form</field>
+            <field eval="18" name="priority"/>
             <field name="arch" type="xml">
              <page string="Current Activity" position="inside">
-                    <field name="project_id" widget="selection"/>
+                    <field name="context_project_id" completion="1" />
                 </page>
             </field>
         </record>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 8c1be345402..e00d72ef1ce 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -46,8 +46,8 @@
  	<record id="project_task_rule" model="ir.rule">
         <field model="ir.model.fields" name="field_id" search="[('model','=','project.task'),('name','=','project_id')]"/>
         <field name="operator">=</field>
-        <field name="operand">user.project_id.id</field>
-        <field name="domain_force">['|',('project_id','=',False),('project_id','=',[user.project_id.id])]</field>
+        <field name="operand">user.context_project_id.id</field>
+        <field name="domain_force">['|',('project_id','=',False),('project_id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="project_task_rule_group"/>
     </record>
 
@@ -59,8 +59,8 @@
  	<record id="project_task_work_rule" model="ir.rule">
         <field model="ir.model.fields" name="field_id" search="[('model','=','project.task.work'),('name','=','task_id.project_id')]"/>
         <field name="operator">=</field>
-        <field name="operand">user.project_id.id</field>
-        <field name="domain_force">['|',('task_id.project_id','=',False),('task_id.project_id','=',[user.project_id.id])]</field>
+        <field name="operand">user.context_project_id.id</field>
+        <field name="domain_force">['|',('task_id.project_id','=',False),('task_id.project_id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="project_task_work_rule_group"/>
     </record>
 
@@ -72,8 +72,8 @@
  	<record id="project_project_rule" model="ir.rule">
         <field model="ir.model.fields" name="field_id" search="[('model','=','project.project'),('name','=','id')]"/>
         <field name="operator">=</field>
-        <field name="operand">user.project_id.id</field>
-        <field name="domain_force">['|',('id','=',False),('id','=',[user.project_id.id])]</field>
+        <field name="operand">user.context_project_id.id</field>
+        <field name="domain_force">['|',('id','=',False),('id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="project_project_rule_group"/>
     </record>
 
@@ -85,8 +85,8 @@
  	<record id="project_message_rule" model="ir.rule">
         <field model="ir.model.fields" name="field_id" search="[('model','=','project.message'),('name','=','project_id')]"/>
         <field name="operator">=</field>
-        <field name="operand">user.project_id.id</field>
-        <field name="domain_force">['|',('project_id','=',False),('project_id','=',[user.project_id.id])]</field>
+        <field name="operand">user.context_project_id.id</field>
+        <field name="domain_force">['|',('project_id','=',False),('project_id','=',[user.context_project_id.id])]</field>
         <field name="rule_group" ref="project_message_rule_group"/>
     </record>