diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index aeaffdecd66..dcec7463a72 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -19704,6 +19704,12 @@ msgstr ""
 msgid "yes"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_users.py:955
+#, python-format
+msgid "Before clicking on 'Change Password', you have to write a new password."
+msgstr ""
+
 #. module: base
 #: model:res.country,name:base.ax
 msgid "Åland Islands"
diff --git a/odoo/addons/base/res/res_users.py b/odoo/addons/base/res/res_users.py
index 2a17198a7de..5f136959014 100644
--- a/odoo/addons/base/res/res_users.py
+++ b/odoo/addons/base/res/res_users.py
@@ -950,6 +950,8 @@ class ChangePasswordUser(models.TransientModel):
     @api.multi
     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.write({'password': line.new_passwd})
         # don't keep temporary passwords in the database longer than necessary
         self.write({'new_passwd': False})