diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index beb0018dc8d..160ac6a2059 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -171,13 +171,6 @@ class res_users(osv.osv):
     def on_change_login(self, cr, uid, ids, login, context=None):
         return {'value': {'email': login}}
 
-    def on_change_company_id(self, cr, uid, ids, company_id):
-        return {'warning' : {
-                    'title': _("Company Switch Warning"),
-                    'message': _("Please keep in mind that documents currently displayed may not be relevant after switching to another company. If you have unsaved changes, please make sure to save and close all forms before switching to a different company. (You can click on Cancel in the User Preferences now)"),
-                }
-        }
-
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context=context)]
         return self.pool.get('res.partner').onchange_state(cr, uid, partner_ids, state_id, context=context)
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 628cfc4f858..c020de1f5ee 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -283,7 +283,7 @@
                         <field name="lang" readonly="0"/>
                         <field name="tz" readonly="0"/>
                         <field name="company_id" widget="selection" readonly="0"
-                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
+                            groups="base.group_multi_company"/>
                     </group>
                     <group string="Email Preferences">
                         <field name="email" widget="email" readonly="0"/>