diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 8380cd8b23f..5fd7917f444 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -254,6 +254,6 @@ class res_users(osv.Model):
         # overridden to automatically invite user to sign up
         user_id = super(res_users, self).create(cr, uid, values, context=context)
         user = self.browse(cr, uid, user_id, context=context)
-        if user.email:
+        if context and context.get('reset_password') and user.email:
             user.action_reset_password()
         return user_id
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 90729c54285..f7bfdd8eeb5 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data>
 
+        <!-- add context in action to enable automatic reset password -->
+        <record id="base.action_res_users" model="ir.actions.act_window">
+            <field name="context">{'reset_password': True}</field>
+        </record>
+
         <record id="res_users_form_view" model="ir.ui.view">
             <field name="name">user.form.state</field>
             <field name="model">res.users</field>