diff --git a/odoo/addons/base/models/res_users.py b/odoo/addons/base/models/res_users.py
index 48d832ab76c..a9804cf53fc 100644
--- a/odoo/addons/base/models/res_users.py
+++ b/odoo/addons/base/models/res_users.py
@@ -1876,9 +1876,8 @@ class ChangePasswordUser(models.TransientModel):
 
     def change_password_button(self):
         for line in self:
-            if not line.new_passwd:
-                raise UserError(_("Before clicking on 'Change Password', you have to write a new password."))
-            line.user_id._change_password(line.new_passwd)
+            if line.new_passwd:
+                line.user_id._change_password(line.new_passwd)
         # don't keep temporary passwords in the database longer than necessary
         self.write({'new_passwd': False})
 
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 3cf096fda24..7e2df572041 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -39,8 +39,8 @@
                 <!-- the user list is editable, but one cannot add or delete rows -->
                 <tree string="Users" editable="bottom" create="false" delete="false">
                     <field name="user_id" invisible="1"/>
-                    <field name="user_login"/>
-                    <field name="new_passwd" required="True" password="True"/>
+                    <field name="user_login" force_save="1"/>
+                    <field name="new_passwd" password="True"/>
                 </tree>
             </field>
         </record>