diff --git a/addons/website/models/res_company.py b/addons/website/models/res_company.py
index e97267850b2..31d16a52e25 100644
--- a/addons/website/models/res_company.py
+++ b/addons/website/models/res_company.py
@@ -28,7 +28,7 @@ class Company(models.Model):
         else:
             return self.env.ref('base.public_user').sudo().copy({
                 'name': 'Public user for %s' % self.name,
-                'login': 'public_company_%s' % self.id,
+                'login': 'public_user@company_%s.com' % self.id,
                 'company_id': self.id,
                 'company_ids': [(6, 0, [self.id])],
             })