diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index b36e635a8c0..6d4d24b929b 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1298,6 +1298,8 @@
 		<field name="name">Administrator</field>
 		<field name="signature">Administrator</field>
 		<field name="action_id" ref="action_menu_admin"/>
+		<field name="menu_id" ref="action_menu_admin"/>
+		<field name="menu_id" ref="action_menu_admin"/>
 		<field name="address_id" ref="main_address"/>
 		<field name="groups_id" eval="[(6,0,[group_admin])]"/>
 		<field name="company_id" ref="main_company"/>
diff --git a/bin/addons/base/base_demo.xml b/bin/addons/base/base_demo.xml
index 8ef0ae5f22c..2f8f5d9a83e 100644
--- a/bin/addons/base/base_demo.xml
+++ b/bin/addons/base/base_demo.xml
@@ -7,6 +7,7 @@
 		<field name="name">Demo User</field>
 		<field name="signature">Fabien Pinckaers</field>
 		<field name="action_id" ref="action_menu_admin"/>
+		<field name="menu_id" ref="action_menu_admin"/>
 		<field name="address_id" ref="main_address"/>
 		<field name="company_id" ref="main_company"/>
 	</record>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 3e9dad03140..3dcdf46910e 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -116,6 +116,7 @@
 						<field name="address_id"/>
 						<field name="company_id" required="1"/>
 						<field name="action_id" domain="[('usage','=','menu')]" required="True"/>
+						<field name="menu_id" domain="[('usage','=','menu')]" required="True"/>
 						<field name="signature" colspan="4"/>
 					</page>
 					<page string="Security">
@@ -181,8 +182,20 @@
 		<field name="res_model">res.users</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
-		<field name="view_id" ref="base.view_users_tree"/>
 	</record>
+	<record model="ir.actions.act_window.view" id="open_module_users_list_view1">
+		<field name="sequence" eval="10"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="view_users_tree"/>
+		<field name="act_window_id" ref="open_module_users_list"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="open_module_users_list_view2">
+		<field name="sequence" eval="20"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="view_users_form"/>
+		<field name="act_window_id" ref="open_module_users_list"/>
+	</record>
+
 	<menuitem name="Administration/Configuration/User/Define Users" action="open_module_users_list" sequence="1" id="menu_users_list"/>
 
 </data>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index fe9b4953859..a6c31df1dc2 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -372,6 +372,19 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_users_tree"/>
 	</record>
+	<record model="ir.actions.act_window.view" id="action_res_users_view1">
+		<field name="sequence" eval="10"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="view_users_tree"/>
+		<field name="act_window_id" ref="action_res_users"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_res_users_view2">
+		<field name="sequence" eval="20"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="view_users_form"/>
+		<field name="act_window_id" ref="action_res_users"/>
+	</record>
+
 	<menuitem name="Administration/Users/Users" action="action_res_users" id="menu_action_res_users"/>
 
 	<record model="ir.actions.act_window" id="action_res_users_my">
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 45252070252..85285a822ae 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -89,6 +89,7 @@ class users(osv.osv):
 		'address_id': fields.many2one('res.partner.address', 'Address'),
 		'active': fields.boolean('Active'),
 		'action_id': fields.many2one('ir.actions.actions', 'Action'),
+		'menu_id': fields.many2one('ir.actions.actions', 'Menu'),
 		'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'groups'),
 		'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 		'company_id': fields.many2one('res.company', 'Company'),
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 2abca003639..c25a54e3cca 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -383,7 +383,9 @@ class orm(object):
 									ref = self.pool.get(f._obj)._table
 								except AttributeError:
 									ref = f._obj.replace('.','_')
-								cr.execute("ALTER TABLE %s ADD FOREIGN KEY (%s) REFERENCES %s ON DELETE %s" % (self._table, k, ref, f.ondelete))
+								# ir_actions is inherited so foreign key doesn't work on it
+								if ref <> 'ir_actions':
+									cr.execute("ALTER TABLE %s ADD FOREIGN KEY (%s) REFERENCES %s ON DELETE %s" % (self._table, k, ref, f.ondelete))
 							if f.select:
 								cr.execute("CREATE INDEX %s_%s_index ON %s (%s)" % (self._table, k, self._table, k))
 							if f.required: