diff --git a/src/components/_modal/pages/order/ordererinformation/OrdererInformation.js b/src/components/_modal/pages/order/ordererinformation/OrdererInformation.js
index bd2c6ca03..c848514de 100644
--- a/src/components/_modal/pages/order/ordererinformation/OrdererInformation.js
+++ b/src/components/_modal/pages/order/ordererinformation/OrdererInformation.js
@@ -9,13 +9,16 @@ import * as PropTypes from "prop-types";
 import useOrderPageInformation from "@/components/hooks/useOrderPageInformations";
 import { getStylingAndErrorMessage } from "@/components/_modal/pages/order/utils/order.utils";
 import { validateEmail } from "@/utils/validateEmail";
+import { useEffect } from "react";
 
 export function OrdererInformation({
   isLoadingBranches,
   name,
+  hasAuthMail,
   email,
   lockedMessage,
   invalidClass,
+  isLoading,
   onMailChange,
   message,
   validClass,
@@ -54,9 +57,11 @@ export function OrdererInformation({
             label: "email-placeholder",
           })}
           invalidClass={invalidClass}
-          value={email?.value || ""}
+          disabled={isLoading || hasAuthMail}
+          value={email || ""}
           id="order-user-email"
           onChange={onMailChange}
+          readOnly={isLoading || hasAuthMail}
           skeleton={isLoadingBranches && !email}
         />
 
@@ -165,35 +170,38 @@ export default function Wrap({
 
   const isLoading = isWorkLoading || isPickupBranchLoading || userIsLoading;
 
-  // Email according to agency borrowerCheck (authUser.mail is from cicero and can not be changed)
-  let initialmail = hasBorchk ? authUser?.mail || userMail : userMail;
-
-  if (!email && initialmail) {
-    const status = validateEmail(initialmail);
-    setMail &&
-      setMail({
-        value: initialmail,
-        valid: {
-          status: status,
-          message: status
-            ? null
-            : {
-                context: "form",
-                label: "wrong-email-field",
-              },
-        },
-      });
-  }
+  const map = {};
+  authUser?.agencies?.forEach((a) => (map[a.id] = a.user?.mail));
+
+  const pickupAuthMail = map?.[pickupBranch?.agencyId];
+
+  // Email according to agency borrowerCheck (map[pickupBranch?.agencyId] is from cicero and can not be changed)
+  let initialmail = hasBorchk ? pickupAuthMail || userMail : userMail;
+
+  useEffect(() => {
+    function updateEmail() {
+      const status = validateEmail(initialmail);
+      const message = !status && {
+        context: "form",
+        label: "wrong-email-field",
+      };
+      setMail?.({ value: initialmail, valid: { status, message } });
+    }
+
+    if (initialmail) {
+      updateEmail();
+    }
+  }, [pickupAuthMail, initialmail]);
 
   const showMailMessage =
-    isLoadingBranches || (authUser?.mail && lockedMessage && hasBorchk);
+    isLoadingBranches || (pickupAuthMail && lockedMessage && hasBorchk);
 
   return (
     <OrdererInformation
       isLoadingBranches={isLoadingBranches}
       name={actualUserName}
-      hasAuthMail={!!authUser?.mail}
-      email={email || initialmail}
+      hasAuthMail={!!pickupAuthMail}
+      email={email?.value || initialmail}
       lockedMessage={lockedMessage}
       pickupBranch={pickupBranch}
       invalidClass={invalidClass}
diff --git a/src/lib/api/user.fragments.js b/src/lib/api/user.fragments.js
index c6d0be997..c3a530399 100644
--- a/src/lib/api/user.fragments.js
+++ b/src/lib/api/user.fragments.js
@@ -42,7 +42,13 @@ export function basic() {
           demandDrivenAcquisition
         }
         agencies {
+          id
+          name
+          type
           hitcount
+          user {
+            mail
+          }
           result {
             branchId
             agencyId