diff --git a/docs/changes.rst b/docs/changes.rst
index bd552d990..489a9b678 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -9,7 +9,8 @@ Changelog
   Ref: scrum-1295
 - Added views to find measure title duplications
   Refs: scrum-1550
-
+- Make the login plone 6 compatible
+  [ale-rt]
 
 15.0.8 (2023-10-24)
 -------------------
diff --git a/src/euphorie/client/browser/login.py b/src/euphorie/client/browser/login.py
index f7676340e..64b9d48d9 100644
--- a/src/euphorie/client/browser/login.py
+++ b/src/euphorie/client/browser/login.py
@@ -72,12 +72,13 @@ def setLanguage(self, came_from):
 
     def login(self, account, remember):
         pas = getToolByName(self.context, "acl_users")
-        pas.updateCredentials(
-            self.request,
-            self.request.RESPONSE,
-            account.loginname,
-            account.password,
-        )
+        with api.env.adopt_user(username=account.getUserName()):
+            pas.updateCredentials(
+                self.request,
+                self.request.RESPONSE,
+                account.loginname,
+                account.password,
+            )
         notify(UserLoggedInEvent(account))
         if remember:
             self.request.RESPONSE.cookies["__ac"]["expires"] = cookie_expiration_date(
@@ -276,12 +277,13 @@ def __call__(self):
                 account = self._tryRegistration()
                 if account:
                     pas = getToolByName(self.context, "acl_users")
-                    pas.updateCredentials(
-                        self.request,
-                        self.request.response,
-                        account.getUserName(),
-                        account.password,
-                    )
+                    with api.env.adopt_user(username=account.getUserName()):
+                        pas.updateCredentials(
+                            self.request,
+                            self.request.response,
+                            account.getUserName(),
+                            account.password,
+                        )
                 else:
                     self.error = True