diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index c5c95276b16..0c0e3398f88 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -157,7 +157,7 @@ def _lang_get(self, cr, uid, context=None):
     lang_pool = self.pool.get('res.lang')
     ids = lang_pool.search(cr, uid, [], context=context)
     res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
-    return [(r['code'], r['name']) for r in res] + [('','')]
+    return [(r['code'], r['name']) for r in res]
 
 POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
 ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 14673ce118f..9c1464f2ffd 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -486,13 +486,6 @@ class res_users(osv.osv):
             'tag': 'reload',
         }
 
-    def preference_change_password(self, cr, uid, ids, context=None):
-        return {
-            'type': 'ir.actions.client',
-            'tag': 'change_password',
-            'target': 'new',
-        }
-
     def has_group(self, cr, uid, group_ext_id):
         """Checks whether user belongs to given group.
 
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 78579fc66df..7c4988bd1f0 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -213,8 +213,7 @@
                         <field name="signature" readonly="0"/>
                     </group>
                     <footer>
-                        <button name="preference_change_password" type="object" string="Change password"/>
-                        <button name="preference_save" type="object" string="Save"/>
+                        <button name="preference_save" type="object" class="oe_highlight" string="Save"/>
                         or
                         <button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>
                     </footer>