diff --git a/cross_connect_server/models/cross_connect_client.py b/cross_connect_server/models/cross_connect_client.py
index 04f5f0ed9a..f60f665335 100644
--- a/cross_connect_server/models/cross_connect_client.py
+++ b/cross_connect_server/models/cross_connect_client.py
@@ -73,7 +73,7 @@ def _request_access(self, access_request):
             lambda u: u.cross_connect_client_user_id == access_request.id
         )
         vals = {
-            "login": access_request.login,
+            "login": f"{self.id}_{access_request.id}_{access_request.login}",
             "email": access_request.email,
             "name": access_request.name,
             "lang": access_request.lang,
diff --git a/cross_connect_server/tests/test_cross_connect_server.py b/cross_connect_server/tests/test_cross_connect_server.py
index 9006cf61a8..371ffefcd0 100644
--- a/cross_connect_server/tests/test_cross_connect_server.py
+++ b/cross_connect_server/tests/test_cross_connect_server.py
@@ -170,7 +170,7 @@ def test_access_ok(self):
         self.assertEqual(len(rc.records), 1)
         new_user = rc.records[0]
         self.assertEqual(new_user.name, "Client User")
-        self.assertEqual(new_user.login, "user@client.example.org")
+        self.assertEqual(new_user.login, f"{self.client.id}_12_user@client.example.org")
         self.assertEqual(new_user.email, "user@client.example.org")
         self.assertEqual(new_user.lang, "en_US")
         self.assertEqual(new_user.cross_connect_client_id.id, self.client.id)
@@ -271,7 +271,9 @@ def test_access_existing(self):
         self.assertEqual(len(rc2.records), 0)
         new_user = rc.records[0]
         self.assertEqual(new_user.name, "Client User2")
-        self.assertEqual(new_user.login, "user2@client.example.org")
+        self.assertEqual(
+            new_user.login, f"{self.client.id}_12_user2@client.example.org"
+        )
         self.assertEqual(new_user.email, "user2@client.example.org")
         self.assertEqual(new_user.lang, "en_US")
         self.assertIn(self.env.ref("fastapi.group_fastapi_user"), new_user.groups_id)