diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index cef36dda8e4..b87c0ef4382 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -111,7 +111,8 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="login" select="1"/>
-                        <field name="new_password" password="True"/>
+                        <field name="id" invisible="1"/>
+                        <field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
                         <field name="active"/>
                     </group>
                     <notebook colspan="4">
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index cd8fa6563e5..f2140b30f1d 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -221,8 +221,8 @@ class users(osv.osv):
         'password': fields.char('Password', size=64, invisible=True, help="Keep empty if you don't want the user to be able to connect on the system."),
         'new_password': fields.function(_get_password, method=True, type='char', size=64,
                                 fnct_inv=_set_new_password,
-                                string='Change password', help="Only specify a value if you want to change the user password. "
-                                "This user will have to logout and login again!"),
+                                string='Set password', help="Specify a value only when creating a user or if you're changing the user's password, "
+                                                            "otherwise leave empty. After a change of password, the user has to login again."),
         'user_email': fields.char('Email', size=64),
         'signature': fields.text('Signature', size=64),
         'active': fields.boolean('Active'),