diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index d9ae041abec..7f290611513 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -434,7 +434,7 @@
               </xpath>
               <xpath expr="//label[@string='description']"
                  position="attributes">
-                <attribute name="string">Set Timezone,Language,Interface,MenuTip as default for all users by company.</attribute>
+                <attribute name="string">Specify default values. These data are just default values, each user is free to change his own preferences.</attribute>
               </xpath>
               <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
@@ -442,7 +442,6 @@
               </xpath>
                <group string="res_config_contents" position="replace">
                       <group colspan="4">
-                          <field colspan="4" name="company_id" />
                           <field colspan="4" name="context_tz" />
                           <field colspan="4" name="context_lang" />
                           <field colspan="4" name="view" />
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index d52f1763b04..1de755bccf1 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -610,13 +610,11 @@ class user_preferences_config(osv.osv_memory):
     _name = 'user.preferences.config'
     _inherit = 'res.config'
     _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required=True,
-            help="Select company for configure by company ."),
         'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
-            help="The company's timezone, used to perform timezone conversions "
+            help="Set default for new user's timezone, used to perform timezone conversions "
                  "between the server and the client."),
         'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="Sets the language for the company's user interface, when UI "
+            help="Sets default language for the  new user's user interface, when UI "
                  "translations are available"),
         'view': fields.selection([('simple','Simplified'),
                                   ('extended','Extended')],
@@ -625,19 +623,18 @@ class user_preferences_config(osv.osv_memory):
                                  
     }
     _defaults={
-               'company_id':lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
                'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
                'context_lang':'en_US',
     }
 
     def execute(self, cr, uid, ids, context=None):
-        usr_obj = self.pool.get("res.users")
-        get_val = self.browse(cr, uid, ids)[0]
-        data_ids = usr_obj.search(cr,uid,[('company_id','=',get_val.company_id.id)])
-        if data_ids:
-            for w_id in data_ids:
-                usr_obj.write(cr, uid, [w_id], {'context_tz': get_val.context_tz,'context_lang':get_val.context_lang,'view':get_val.view,'menu_tips':get_val.menu_tips})
-        return True
+        for o in self.browse(cr, uid, ids, context=context):
+            ir_values_obj = self.pool.get('ir.values')
+            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
+            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
+            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
+            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
+        return {}
 
 user_preferences_config()