diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index 79b1b5e338c..00e0dc6b7df 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -172,8 +172,10 @@ class ir_values(osv.osv):
                 else:
                     where.append('res_id=%s')
                     params.append(res_id)
-
-            where.append('(user_id=%s or (user_id IS NULL)) order by id')
+            order = 'id'
+            if key == 'default':
+                order = 'user_id'
+            where.append('(user_id=%s or (user_id IS NULL)) order by '+ order)
             params.append(uid)
             clause = ' and '.join(where)
             cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)