diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index ba709a48175..53cfe69c023 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -167,7 +167,8 @@ class res_users(osv.osv):
     }
 
     def on_change_login(self, cr, uid, ids, login, context=None):
-        return {'value': {'email': login}}
+        v = {'email': login} if tools.single_email_re.match(login) else {}
+        return {'value': v}
 
     def on_change_company_id(self, cr, uid, ids, company_id):
         return {'warning' : {