diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 0a8dde685f1..2f7bd553d3d 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -269,6 +269,8 @@ class res_users(osv.Model):
         user_id = super(res_users, self).create(cr, uid, values, context=context)
         user = self.browse(cr, uid, user_id, context=context)
         if user.email and (not context or not context.get('no_reset_password')):
-            ctx = dict(context, create_user=True)
-            self.action_reset_password(cr, uid, [user.id], context=ctx)
+            if not context:
+                context = {}
+            context.update({'create_user': True})
+            self.action_reset_password(cr, uid, [user.id], context=context)
         return user_id