diff --git a/assets/scripts/vanilla/controllers/back_partner_view/form_partner.js b/assets/scripts/vanilla/controllers/back_partner_view/form_partner.js
index 1b9841b23..96d0cb9c3 100644
--- a/assets/scripts/vanilla/controllers/back_partner_view/form_partner.js
+++ b/assets/scripts/vanilla/controllers/back_partner_view/form_partner.js
@@ -48,7 +48,9 @@ function histoUpdateFieldsVisibility () {
 function histoUpdateValueFromData (elementName, elementData, target) {
   document.querySelector(elementName).value = target.getAttribute(elementData)
 }
-function histoUpdatePermissionsFromRole (editOrCreate, toggleValue) {
+
+//TODO : remove editOrCreate param after feature_multi_territories deletion (will always be 'partner')
+function histoUpdatePermissionsFromRole (editOrCreate) {
   const elementTogglePermissionAffectation = document.querySelector('#user_' + editOrCreate + '_permission_affectation_toggle input')
   const elementTextPermissionAffectation = document.querySelector('#user_' + editOrCreate + '_permission_affectation_text')
   if (!elementTogglePermissionAffectation || !elementTextPermissionAffectation) {
@@ -68,12 +70,6 @@ function histoUpdatePermissionsFromRole (editOrCreate, toggleValue) {
     elementTextPermissionAffectation.classList.remove('fr-hidden')
   } else {
     elementTogglePermissionAffectation.removeAttribute('disabled')
-    if (toggleValue === false && elementTogglePermissionAffectation.checked) {
-      elementTogglePermissionAffectation.click()
-    }
-    if (editOrCreate === 'edit' && toggleValue === true && !elementTogglePermissionAffectation.checked) {
-      elementTogglePermissionAffectation.click()
-    }
     elementTextPermissionAffectation.classList.add('fr-hidden')
   }
 }
@@ -116,61 +112,6 @@ document.querySelectorAll('.btn-delete-partner').forEach(swbtn => {
     })
   })
 })
-let userEditedId = null
-
-function clearErrors () {
-  const divErrorElements = document.querySelectorAll('.fr-input-group--error')
-  divErrorElements.forEach((divErrorElement) => {
-    divErrorElement.classList.remove('fr-input-group--error')
-    const pErrorElement = divErrorElement.querySelector('.fr-error-text')
-    if (pErrorElement) {
-      pErrorElement.classList.add('fr-hidden')
-    }
-  })
-}
-document.querySelectorAll('.btn-edit-partner-user').forEach(swbtn => {
-  swbtn.addEventListener('click', evt => {
-    clearErrors()
-    const target = evt.target
-    document.querySelectorAll('.fr-modal-user-edit_useremail').forEach(userItem => {
-      userItem.textContent = target.getAttribute('data-useremail')
-    })
-    userEditedId = target.getAttribute('data-userid')
-    if (target.getAttribute('data-submit-url')) {
-      document.querySelector('#fr-modal-user-edit form').action = target.getAttribute('data-submit-url')
-    }
-    histoUpdateValueFromData('#user_edit_userid', 'data-userid', target)
-    histoUpdateValueFromData('#user_edit_email', 'data-useremail', target)
-    histoUpdateValueFromData('#user_edit_nom', 'data-usernom', target)
-    histoUpdateValueFromData('#user_edit_prenom', 'data-userprenom', target)
-    const isMailingActive = target.getAttribute('data-userismailingactive')
-    if (isMailingActive === '1') {
-      document.querySelector('#user_edit_is_mailing_active-1').checked = true
-    } else {
-      document.querySelector('#user_edit_is_mailing_active-2').checked = true
-    }
-
-    const elementPermissionAffectation = document.querySelector('#user_edit_permission_affectation')
-    if (elementPermissionAffectation) {
-      elementPermissionAffectation.removeAttribute('disabled')
-    }
-
-    const userRole = target.getAttribute('data-userrole')
-    const rolesSelect = document.querySelector('#user_edit_roles')
-    rolesSelect.value = userRole
-    histoUpdatePermissionsFromRole('edit', target.getAttribute('data-userpermissionaffectation') === '1')
-
-    document.querySelector('#user_edit_form').addEventListener('submit', (e) => {
-      histoUpdateSubmitButton('#user_edit_form_submit', 'Edition en cours...')
-    })
-  })
-})
-if (document.querySelector('.fr-btn-add-user')) {
-  document.querySelector('.fr-btn-add-user').addEventListener('click', () => {
-    clearErrors()
-    userEditedId = null
-  })
-}
 
 if (document.querySelector('#partner_type')) {
   histoUpdateFieldsVisibility()
@@ -179,19 +120,6 @@ if (document.querySelector('#partner_type')) {
   })
 }
 
-if (document.querySelector('#user_create_roles')) {
-  document.querySelector('#user_create_roles').addEventListener('change', () => {
-    histoUpdatePermissionsFromRole('create', null)
-  })
-  histoUpdatePermissionsFromRole('create', null)
-}
-if (document.querySelector('#user_edit_roles')) {
-  document.querySelector('#user_edit_roles').addEventListener('change', () => {
-    histoUpdatePermissionsFromRole('edit', null)
-  })
-  histoUpdatePermissionsFromRole('edit', null)
-}
-
 const territorySelect = document.querySelector("#partner_territory");
 
 if (territorySelect) {
@@ -240,10 +168,33 @@ deletePartnerForm.forEach(form => {
 })
 
 //TODO : delete with feature_multi_territories deletion
+function clearErrors () {
+  const divErrorElements = document.querySelectorAll('.fr-input-group--error')
+  divErrorElements.forEach((divErrorElement) => {
+    divErrorElement.classList.remove('fr-input-group--error')
+    const pErrorElement = divErrorElement.querySelector('.fr-error-text')
+    if (pErrorElement) {
+      pErrorElement.classList.add('fr-hidden')
+    }
+  })
+}
+
+if (document.querySelector('.fr-btn-add-user')) {
+  document.querySelector('.fr-btn-add-user').addEventListener('click', () => {
+    clearErrors()
+  })
+}
+
+if (document.querySelector('#user_create_roles')) {
+  document.querySelector('#user_create_roles').addEventListener('change', () => {
+    histoUpdatePermissionsFromRole('create')
+  })
+  histoUpdatePermissionsFromRole('create')
+}
+
 const checkUserMail = (el) => {
   const formData = new FormData()
   formData.append('email', el.value)
-  formData.append('userEditedId', userEditedId)
   formData.append('_token', el.getAttribute('data-token'))
   fetch('/bo/partenaires/checkmail', {
     method: 'POST',
@@ -281,7 +232,7 @@ emailInputs.forEach(emailInput => {
     checkUserMail(this)
   })
 })
-//END TODO
+//END TODO : delete with feature_multi_territories deletion
 
 loadWindowWithLocalStorage('click', '[data-filter-list-partner]', 'search-partner-form')
 updateLocalStorageOnEvent('input', '#partner-input', 'back_link_partners')
@@ -290,48 +241,67 @@ updateLocalStorageOnEvent('change', '#partner-filters-types', 'back_link_partner
 updateLocalStorageWithPaginationParams('click', '#partner-pagination a', 'back_link_partners')
 
 //add for multi territories
+document.querySelectorAll('.btn-edit-partner-user').forEach(swbtn => {
+  swbtn.addEventListener('click', event => {
+    const refreshUrl = event.target.dataset.refreshUrl;
+    document.querySelector('#fr-modal-user-edit button[type="submit"]').disabled = true;
+    document.querySelector('#fr-modal-user-edit-title').innerHTML = 'Chargement en cours...'
+    document.querySelector('#fr-modal-user-edit-form-container').innerHTML = 'Chargement en cours...'
+    fetch(refreshUrl).then(response => {
+      updateModaleFromResponse(response, '#fr-modal-user-edit', addEventListenerOnRoleChange)
+    })
+  })
+})
+
 const modalPartnerUserCreate = document?.querySelector('#fr-modal-user-create')
-const btnSubmit = modalPartnerUserCreate?.querySelector('button[type="submit"]')
 if(modalPartnerUserCreate){
   modalPartnerUserCreate.addEventListener('dsfr.conceal', (event) => {
     const refreshUrl = event.target.dataset.refreshUrl;
-    btnSubmit.disabled = true
+    modalPartnerUserCreate.querySelector('button[type="submit"]').disabled = true;
     fetch(refreshUrl).then(response => {
-      managePartnerAddUserFormResponse(response)
+      updateModaleFromResponse(response, '#fr-modal-user-create', addEventListenerOnRoleChange)
     })
   })
 }
 
-function attachSubmitPartnerAddUserForm () {
-  document.querySelector('#partner-add-user-form').addEventListener('submit', (e) => {
-    e.preventDefault()
-    btnSubmit.disabled = true
-    const formData = new FormData(e.target)
-    fetch(e.target.action, {method: 'POST', body: formData}).then(response => {
-      managePartnerAddUserFormResponse(response)
+function addEventListenerOnRoleChange(){
+  if (document.querySelector('#user_partner_role')) {
+    document.querySelector('#user_partner_role').addEventListener('change', () => {
+      histoUpdatePermissionsFromRole('partner')
     })
-  })
+    histoUpdatePermissionsFromRole('partner')
+  }
 }
 
-function managePartnerAddUserFormResponse(response) {
-  console.log(response);
-  if (response.redirected) {
-    window.location.href = response.url
-  }else if (response.ok) {
+function updateModaleFromResponse(response, modalSelector, callback = null){
+  if (response.ok) {
     response.json().then((response) => {
-      document.querySelector('#partner-add-user-title').innerHTML = response.title
-        document.querySelector('#partner-add-user-form-container').innerHTML = response.content
-        attachSubmitPartnerAddUserForm()
-        if (document.querySelector('#user_partner_role')) {
-          document.querySelector('#user_partner_role').addEventListener('change', () => {
-            histoUpdatePermissionsFromRole('partner', null)
-          })
-          histoUpdatePermissionsFromRole('partner', null)
+      if (response.redirect) {
+        window.location.href = response.url
+        window.location.reload()
+      }else{
+        document.querySelector(modalSelector + '-title').innerHTML = response.title
+        document.querySelector(modalSelector + '-form-container').innerHTML = response.content
+        attachSubmitFormModal(modalSelector, callback)
+        if (typeof callback === 'function') {
+          callback();
         }
-        btnSubmit.disabled = false
+        document.querySelector(modalSelector +' button[type="submit"]').disabled = false
+      }
     })
   }else{
     const content = '<div class="fr-alert fr-alert--error" role="alert"><p class="fr-alert__title">Erreur</p><p>Une erreur est survenue veuillez fermer cette fenêtre.</p></div>'
-    document.querySelector('#partner-add-user-form-container').innerHTML = content
+    document.querySelector(modalSelector + '-form-container').innerHTML = content
   }
 }
+
+function attachSubmitFormModal (modalSelector, callback) {
+  document.querySelector(modalSelector + ' form').addEventListener('submit', (e) => {
+    e.preventDefault()
+    document.querySelector(modalSelector + ' button[type="submit"]').disabled = true
+    const formData = new FormData(e.target)
+    fetch(e.target.action, {method: 'POST', body: formData}).then(response => {
+      updateModaleFromResponse(response, modalSelector, callback)
+    })
+  })
+}
diff --git a/src/Controller/Back/PartnerController.php b/src/Controller/Back/PartnerController.php
index 2fd1c6b69..2bed4ca59 100755
--- a/src/Controller/Back/PartnerController.php
+++ b/src/Controller/Back/PartnerController.php
@@ -11,6 +11,7 @@
 use App\Entity\User;
 use App\Entity\UserPartner;
 use App\Factory\UserFactory;
+use App\Form\EditUserPartnerType;
 use App\Form\PartnerPerimetreType;
 use App\Form\PartnerType;
 use App\Form\SearchPartnerType;
@@ -43,6 +44,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -378,7 +380,9 @@ public function addUserPartnerMulti(
                 $message = 'L\'utilisateur a bien été créé. Un e-mail de confirmation a été envoyé à '.$user->getEmail();
                 $this->addFlash('success', $message);
 
-                return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents']);
+                $url = $this->generateUrl('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], UrlGeneratorInterface::ABSOLUTE_URL);
+
+                return $this->json(['redirect' => true, 'url' => $url]);
             }
             $formMultiMail->get('email')->addError(new FormError('Agent introuvalbe avec cette adresse e-mail.'));
         }
@@ -422,7 +426,9 @@ public function addUserPartner(
             $message = 'L\'utilisateur a bien été créé. Un e-mail de confirmation a été envoyé à '.$user->getEmail();
             $this->addFlash('success', $message);
 
-            return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents']);
+            $url = $this->generateUrl('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], UrlGeneratorInterface::ABSOLUTE_URL);
+
+            return $this->json(['redirect' => true, 'url' => $url]);
         }
         $content = $this->renderView('_partials/_modal_user_create_form.html.twig', ['formUserPartner' => $formUserPartner]);
 
@@ -496,94 +502,38 @@ public function addUser(
         return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], Response::HTTP_SEE_OTHER);
     }
 
-    #[Route('/{id}/editerutilisateur', name: 'back_partner_user_edit', methods: ['POST'])]
+    #[Route('/{partner}/editerutilisateur/{user}', name: 'back_partner_user_edit')]
     public function editUser(
-        Request $request,
         Partner $partner,
+        User $user,
+        Request $request,
         UserManager $userManager,
-        UserRepository $userRepository,
-        PartnerRepository $partnerRepository,
-        ValidatorInterface $validator,
-    ): Response {
-        $userId = $request->request->get('user_id');
-        $user = $userManager->find((int) $userId);
-        /** @var User $user */
-        if (!$userId || !$user || !$user->hasPartner($partner)) {
-            $this->addFlash('error', 'Utilisateur introuvable.');
-
-            return $this->redirectToRoute('back_partner_index', [], Response::HTTP_SEE_OTHER);
-        }
-        if (!$this->isCsrfTokenValid('partner_user_edit', $request->request->get('_token'))) {
-            $this->addFlash('error', 'Token CSRF invalide, merci d\'actualiser la page et réessayer.');
-
-            return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], Response::HTTP_SEE_OTHER);
-        }
+    ): JsonResponse|RedirectResponse {
         $this->denyAccessUnlessGranted('USER_EDIT', $user);
-
-        $data = $request->get('user_edit');
-        if (!EmailFormatValidator::validate($data['email'])) {
-            $this->addFlash('error', 'L\'adresse e-mail n\'est pas valide.');
-
-            return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], Response::HTTP_SEE_OTHER);
-        }
-        if ($data['email'] != $user->getEmail()) {
-            $userExist = $userRepository->findOneBy(['email' => $data['email']]);
-            if ($userExist && !\in_array('ROLE_USAGER', $userExist->getRoles())) {
-                $this->addFlash('error', 'Un utilisateur existe déjà avec cette adresse e-mail.');
-
-                return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], Response::HTTP_SEE_OTHER);
-            }
-            $partnerExist = $partnerRepository->findOneBy(['email' => $data['email']]);
-            if ($partnerExist) {
-                $this->addFlash('error', 'Un partenaire existe déjà avec cette adresse e-mail.');
-
-                return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], Response::HTTP_SEE_OTHER);
+        $originalEmail = $user->getEmail();
+        $editUserRoute = $this->generateUrl('back_partner_user_edit', ['partner' => $partner->getId(), 'user' => $user->getId(), 'from' => $request->query->get('from')]);
+        $formUserPartner = $this->createForm(EditUserPartnerType::class, $user, ['action' => $editUserRoute]);
+        $formUserPartner->handleRequest($request);
+        if ($formUserPartner->isSubmitted() && $formUserPartner->isValid()) {
+            if ($originalEmail != $user->getEmail()) {
+                $user->setPassword('');
+                $userManager->sendAccountActivationNotification($user);
             }
-        }
-        if ($data['roles'] != $user->getRoles()[0]) {
-            if (!$this->canAttributeRole($data['roles'])) {
-                return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], Response::HTTP_SEE_OTHER);
+            $userManager->flush();
+            $this->addFlash('success', 'L\'utilisateur a bien été modifié.');
+            $url = $this->generateUrl('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], UrlGeneratorInterface::ABSOLUTE_URL);
+            if ('users' == $request->query->get('from')) {
+                $url = $this->generateUrl('back_user_index', [], UrlGeneratorInterface::ABSOLUTE_URL);
             }
-        }
 
-        $updateData = [
-            'nom' => $data['nom'],
-            'prenom' => $data['prenom'],
-            'roles' => $data['roles'],
-            'email' => $data['email'],
-            'isMailingActive' => $data['isMailingActive'],
-            'hasPermissionAffectation' => $data['hasPermissionAffectation'] ?? false,
-        ];
-        if (!$this->isGranted(PartnerVoter::ASSIGN_PERMISSION_AFFECTATION, $partner)) {
-            unset($updateData['hasPermissionAffectation']);
-        } else {
-            $updateData['hasPermissionAffectation'] = $updateData['hasPermissionAffectation'] ?? false;
+            return $this->json(['redirect' => true, 'url' => $url]);
         }
+        $content = $this->renderView('_partials/_modal_user_edit_form.html.twig', ['formUserPartner' => $formUserPartner]);
 
-        $user = $userManager->updateUserFromData(
-            user: $user,
-            data: $updateData,
-            save: false
-        );
-
-        $errors = $validator->validate($user);
-        foreach ($errors as $error) {
-            $this->addFlash('error', $error->getMessage());
-        }
-        if (0 === \count($errors)) {
-            $userManager->save($user);
-            $message = 'L\'utilisateur a bien été modifié.';
-            $this->addFlash('success', $message);
-        }
-
-        $redirect_to = $request->request->get('redirect_to');
-        if ('userList' === $redirect_to) {
-            return $this->redirectToRoute('back_user_index', [], Response::HTTP_SEE_OTHER);
-        }
-
-        return $this->redirectToRoute('back_partner_view', ['id' => $partner->getId(), '_fragment' => 'agents'], Response::HTTP_SEE_OTHER);
+        return $this->json(['content' => $content, 'title' => 'Modifier le compte de : '.$user->getEmail()]);
     }
 
+    // TODO : delete with feature_multi_territories deletion
     private function canAttributeRole(string $role): bool
     {
         if (empty($role)) {
diff --git a/src/Entity/User.php b/src/Entity/User.php
index c527ba0f1..07a97673f 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -23,6 +23,7 @@
 #[ORM\Entity(repositoryClass: UserRepository::class)]
 #[UniqueEntity('email', message: '{{ value }} existe déja, merci de saisir un nouvel e-mail')]
 #[ORM\HasLifecycleCallbacks()]
+#[AppAssert\UserPartnerEmailMulti(groups: ['user_partner_mail_multi'])]
 #[AppAssert\UserPartnerEmail(groups: ['user_partner_mail'])]
 class User implements UserInterface, EntityHistoryInterface, PasswordAuthenticatedUserInterface, TwoFactorInterface
 {
diff --git a/src/Form/EditUserPartnerType.php b/src/Form/EditUserPartnerType.php
new file mode 100755
index 000000000..0946a1edd
--- /dev/null
+++ b/src/Form/EditUserPartnerType.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Form;
+
+use App\Entity\User;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class EditUserPartnerType extends AbstractType
+{
+    private array $roles;
+
+    public function __construct(
+        private readonly Security $security,
+    ) {
+        $this->roles = [];
+        if ($security->isGranted('ROLE_ADMIN')) {
+            $this->roles['Super Admin'] = 'ROLE_ADMIN';
+        }
+        if ($security->isGranted('ROLE_ADMIN_TERRITORY')) {
+            $this->roles['Resp. Territoire'] = 'ROLE_ADMIN_TERRITORY';
+        }
+        $this->roles['Admin. partenaire'] = 'ROLE_ADMIN_PARTNER';
+        $this->roles['Agent'] = 'ROLE_USER_PARTNER';
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $user = $builder->getData();
+        if ($user->getUserPartners()->count() > 1) {
+            $this->roles = [
+                'Admin. partenaire' => 'ROLE_ADMIN_PARTNER',
+                'Agent' => 'ROLE_USER_PARTNER',
+            ];
+        }
+        $builder
+            ->add('nom', null, [
+                'required' => false,
+            ])
+            ->add('prenom', null, [
+                'required' => false,
+            ])
+            ->add('email', TextType::class, [
+                'required' => false,
+                'label' => 'Courriel',
+                'row_attr' => [
+                    'class' => 'fr-mb-1w',
+                ],
+            ])
+            ->add('role', ChoiceType::class, [
+                'choices' => $this->roles,
+                'label' => 'Rôle',
+                'mapped' => false,
+            ])
+            ->add('isMailingActive', ChoiceType::class, [
+                'choices' => [
+                    'Oui' => true,
+                    'Non' => false,
+                ],
+                'expanded' => true,
+                'label' => 'Recevoir les e-mails ?',
+                'help' => 'Si vous cochez oui, des e-mails concernant les signalements seront envoyés à cette adresse.',
+            ]);
+        if (1 === $user->getUserPartners()->count() && $this->security->isGranted('ASSIGN_PERMISSION_AFFECTATION', $user->getPartners()->first())) {
+            $builder->add('hasPermissionAffectation', CheckboxType::class, [
+                'label' => 'Cet utilisateur peut affecter d\'autres partenaires à ses signalements',
+                'required' => false,
+                'row_attr' => [
+                    'class' => 'fr-toggle',
+                ],
+                'attr' => ['class' => 'fr-toggle__input'],
+                'label_attr' => [
+                    'class' => 'fr-toggle__label',
+                    'data-fr-checked-label' => 'Activé',
+                    'data-fr-unchecked-label' => 'Désactivé',
+                ],
+            ]);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => User::class,
+            'validation_groups' => ['user_partner_mail', 'user_partner'],
+        ]);
+    }
+
+    public function getBlockPrefix(): string
+    {
+        return 'user_partner';
+    }
+}
diff --git a/src/Form/UserPartnerEmailType.php b/src/Form/UserPartnerEmailType.php
index b242aa616..ae8b50b4a 100644
--- a/src/Form/UserPartnerEmailType.php
+++ b/src/Form/UserPartnerEmailType.php
@@ -24,7 +24,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => User::class,
-            'validation_groups' => ['user_partner_mail'],
+            'validation_groups' => ['user_partner_mail_multi'],
         ]);
     }
 }
diff --git a/src/Form/UserPartnerType.php b/src/Form/UserPartnerType.php
index b03453a52..7e86c124b 100755
--- a/src/Form/UserPartnerType.php
+++ b/src/Form/UserPartnerType.php
@@ -83,7 +83,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => User::class,
-            'validation_groups' => ['user_partner_mail', 'user_partner'],
+            'validation_groups' => ['user_partner_mail_multi', 'user_partner'],
         ]);
     }
 }
diff --git a/src/Manager/UserManager.php b/src/Manager/UserManager.php
index a79dfc3d6..1e9fa3073 100644
--- a/src/Manager/UserManager.php
+++ b/src/Manager/UserManager.php
@@ -33,6 +33,7 @@ public function __construct(
         parent::__construct($managerRegistry, $entityName);
     }
 
+    // TODO : delete with feature_multi_territories deletion
     public function updateUserFromData(User $user, array $data, bool $save = true): User
     {
         $emailUpdated = false;
@@ -212,7 +213,7 @@ public function getSystemUser(): ?User
         return $this->getRepository()->findOneBy(['email' => $this->parameterBag->get('user_system_email')]);
     }
 
-    private function sendAccountActivationNotification(User $user): void
+    public function sendAccountActivationNotification(User $user): void
     {
         if (!\in_array('ROLE_USAGER', $user->getRoles())
             && User::STATUS_ARCHIVE !== $user->getStatut()
diff --git a/src/Validator/UserPartnerEmailMulti.php b/src/Validator/UserPartnerEmailMulti.php
new file mode 100644
index 000000000..5e951bfd2
--- /dev/null
+++ b/src/Validator/UserPartnerEmailMulti.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Validator;
+
+use Symfony\Component\Validator\Constraint;
+
+#[\Attribute]
+class UserPartnerEmailMulti extends Constraint
+{
+    public function getTargets(): string
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+}
diff --git a/src/Validator/UserPartnerEmailMultiValidator.php b/src/Validator/UserPartnerEmailMultiValidator.php
new file mode 100644
index 000000000..06eea60a3
--- /dev/null
+++ b/src/Validator/UserPartnerEmailMultiValidator.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Validator;
+
+use App\Entity\User;
+use App\Repository\PartnerRepository;
+use App\Repository\UserRepository;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+class UserPartnerEmailMultiValidator extends ConstraintValidator
+{
+    public function __construct(
+        private readonly PartnerRepository $partnerRepository,
+        private readonly UserRepository $userRepository,
+    ) {
+    }
+
+    /**
+     * @param User $user
+     */
+    public function validate($user, Constraint $constraint): void
+    {
+        if (!$user instanceof User) {
+            throw new UnexpectedValueException($user, User::class);
+        }
+
+        if (!$constraint instanceof UserPartnerEmailMulti) {
+            throw new UnexpectedValueException($constraint, UserPartnerEmailMulti::class);
+        }
+
+        $email = $user->getEmail();
+        if (!EmailFormatValidator::validate($email)) {
+            $this->context->buildViolation('L\'adresse e-mail est invalide.')->atPath('email')->addViolation();
+
+            return;
+        }
+        $partnerExist = $this->partnerRepository->findOneBy(['email' => $email]);
+        if ($partnerExist) {
+            $this->context->buildViolation('Un partenaire existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
+        }
+        $userExist = $this->userRepository->findAgentByEmail($email);
+        if (!$userExist) {
+            return;
+        }
+        if ($userExist->isTerritoryAdmin()) {
+            $this->context->buildViolation('Un utilisateur Responsable Territoire existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
+        }
+        if ($userExist->isSuperAdmin()) {
+            $this->context->buildViolation('Un utilisateur Super Admin existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
+        }
+        if ($userExist->hasPermissionAffectation()) {
+            $this->context->buildViolation('Un utilisateur ayant les droits d\'affectation existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
+        }
+        if ($userExist->hasPartnerInTerritory($user->getFirstTerritory())) {
+            $this->context->buildViolation('Un utilisateur avec cette adresse e-mail existe déja sur le territoire.')->atPath('email')->addViolation();
+        }
+    }
+}
diff --git a/src/Validator/UserPartnerEmailValidator.php b/src/Validator/UserPartnerEmailValidator.php
index e34f7e9be..0054a7642 100644
--- a/src/Validator/UserPartnerEmailValidator.php
+++ b/src/Validator/UserPartnerEmailValidator.php
@@ -40,21 +40,9 @@ public function validate($user, Constraint $constraint): void
         if ($partnerExist) {
             $this->context->buildViolation('Un partenaire existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
         }
-        $userExist = $this->userRepository->findAgentByEmail($email);
-        if (!$userExist) {
-            return;
-        }
-        if ($userExist->isTerritoryAdmin()) {
-            $this->context->buildViolation('Un utilisateur Responsable Territoire existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
-        }
-        if ($userExist->isSuperAdmin()) {
-            $this->context->buildViolation('Un utilisateur Super Admin existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
-        }
-        if ($userExist->hasPermissionAffectation()) {
-            $this->context->buildViolation('Un utilisateur ayant les droits d\'affectation existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
-        }
-        if ($userExist->hasPartnerInTerritory($user->getFirstTerritory())) {
-            $this->context->buildViolation('Un utilisateur avec cette adresse e-mail existe déja sur le territoire.')->atPath('email')->addViolation();
+        $userExist = $this->userRepository->findOneBy(['email' => $email]);
+        if ($userExist && $userExist->getId() !== $user->getId()) {
+            $this->context->buildViolation('Un utilisateur existe déjà avec cette adresse e-mail.')->atPath('email')->addViolation();
         }
     }
 }
diff --git a/templates/_partials/_modal_user_create.html.twig b/templates/_partials/_modal_user_create.html.twig
index caf81a391..4fb5c6386 100755
--- a/templates/_partials/_modal_user_create.html.twig
+++ b/templates/_partials/_modal_user_create.html.twig
@@ -7,13 +7,13 @@
                        <button type="button" class="fr-btn--close fr-btn" aria-controls="fr-modal-user-create">Fermer</button>
                     </div>
                     <div class="fr-modal__content">
-                        <h1 id="partner-add-user-title" class="fr-modal__title"></h1>
-                        <div id="partner-add-user-form-container"></div>
+                        <h1 id="fr-modal-user-create-title" class="fr-modal__title">Chargement en cours...</h1>
+                        <div id="fr-modal-user-create-form-container">Chargement en cours...</div>
                     </div>
                     <div class="fr-modal__footer">
                         <ul class="fr-btns-group fr-btns-group--right fr-btns-group--inline-reverse fr-btns-group--inline-lg fr-btns-group--icon-left">
                             <li>
-                                <button class="fr-btn fr-icon-check-line" form="partner-add-user-form" type="submit">
+                                <button class="fr-btn fr-icon-check-line" form="fr-modal-user-create-form" type="submit">
                                     Valider
                                 </button>
                             </li>
diff --git a/templates/_partials/_modal_user_create_email.html.twig b/templates/_partials/_modal_user_create_email.html.twig
index 9b15d4cde..b94d5063a 100755
--- a/templates/_partials/_modal_user_create_email.html.twig
+++ b/templates/_partials/_modal_user_create_email.html.twig
@@ -1,2 +1,2 @@
 {% form_theme formCheckMail 'form/dsfr_theme.html.twig' %}
-{{form(formCheckMail, {'attr': {'id': 'partner-add-user-form'}})}}
\ No newline at end of file
+{{form(formCheckMail, {'attr': {'id': 'fr-modal-user-create-form'}})}}
\ No newline at end of file
diff --git a/templates/_partials/_modal_user_create_form.html.twig b/templates/_partials/_modal_user_create_form.html.twig
index a616436ba..e9becc3c8 100755
--- a/templates/_partials/_modal_user_create_form.html.twig
+++ b/templates/_partials/_modal_user_create_form.html.twig
@@ -1,5 +1,5 @@
 {% form_theme formUserPartner 'form/dsfr_theme.html.twig' %}
-{{ form_start(formUserPartner, {'attr': {'id': 'partner-add-user-form'}}) }}
+{{ form_start(formUserPartner, {'attr': {'id': 'fr-modal-user-create-form'}}) }}
 {{ form_errors(formUserPartner) }}
 <div class="fr-grid-row fr-grid-row--gutters">
     <div class="fr-col-12">
diff --git a/templates/_partials/_modal_user_create_multi.html.twig b/templates/_partials/_modal_user_create_multi.html.twig
index 1a47c826a..5890d4a90 100755
--- a/templates/_partials/_modal_user_create_multi.html.twig
+++ b/templates/_partials/_modal_user_create_multi.html.twig
@@ -1,7 +1,7 @@
 
 <div class="fr-hidden">
     {% form_theme formMultiMail 'form/dsfr_theme.html.twig' %}
-    {{form(formMultiMail, {'attr': {'id': 'partner-add-user-form'}})}}
+    {{form(formMultiMail, {'attr': {'id': 'fr-modal-user-create-form'}})}}
 </div>
 
 <div>
diff --git a/templates/_partials/_modal_user_edit.html.twig b/templates/_partials/_modal_user_edit.html.twig
index e806c133a..4dc8649ce 100755
--- a/templates/_partials/_modal_user_edit.html.twig
+++ b/templates/_partials/_modal_user_edit.html.twig
@@ -7,130 +7,19 @@
                        <button class="fr-btn--close fr-btn" aria-controls="fr-modal-user-edit">Fermer</button>
                     </div>
                     <div class="fr-modal__content">
-                        <h1 id="fr-user-edit-title" class="fr-modal__title">
-                            Modifier le compte de :  <span class="fr-modal-user-edit_useremail"></span>
-                        </h1>   
+                        <h1 id="fr-modal-user-edit-title" class="fr-modal__title">Chargement en cours...</h1>   
                         <span class="fr-mb-3v">Tous les champs sont obligatoires</span>
-                        <br>
-                        <form action="{% if partner is defined %}{{ path('back_partner_user_edit', {id:partner.id}) }}{% else %}#{% endif %}" name="user_edit"
-                                id="user_edit_form" method="POST" class='needs-validation' novalidate="novalidate">
-                            <div class="fr-grid-row fr-grid-row--gutters">
-                                <div class="fr-input-group fr-col-12 fr-col-md-6">
-                                    <label for="user_edit_nom" class="fr-label">Nom</label>
-                                    <input type="text" id="user_edit_nom" name="user_edit[nom]"
-                                        required="required" class="fr-input">
-                                    <p class="fr-error-text fr-hidden">
-                                        Vous devez renseigner le nom du nouvel utilisateur.
-                                    </p>
-                                </div>
-                                <div class="fr-input-group fr-col-12 fr-col-md-6">
-                                    <label for="user_edit_prenom" class="fr-label">Prénom</label>
-                                    <input type="text" id="user_edit_prenom" name="user_edit[prenom]"
-                                        required="required" class="fr-input">
-                                    <p class="fr-error-text fr-hidden">
-                                        Vous devez renseigner le prénom de l'utilisateur
-                                    </p>
-                                </div>
-                            </div>
-                            <div class="fr-grid-row fr-grid-row--gutters">
-                                <div class="fr-input-group fr-col-12 fr-col-md-6">
-                                    <label for="user_edit_roles" class="fr-label">Rôle</label>
-                                    <select id="user_edit_roles" name="user_edit[roles]" required="required" class="fr-select"> 
-                                        <option value="" selected="selected">--- Selectionnez ---</option>
-                                        {% if is_granted('ROLE_ADMIN') %}
-                                            <option value="ROLE_ADMIN">
-                                                Super Admin
-                                            </option>
-                                        {% endif %}
-                                        {% if is_granted('ROLE_ADMIN_TERRITORY') %}
-                                            <option value="ROLE_ADMIN_TERRITORY">
-                                                Resp. Territoire
-                                            </option>
-                                        {% endif %}
-                                        <option value="ROLE_ADMIN_PARTNER">Admin. partenaire</option>
-                                        <option value="ROLE_USER_PARTNER">Agent</option>                           
-                                    </select>
-                                    <p class="fr-error-text fr-hidden">
-                                        Vous devez sélectionner le rôle de l'utilisateur
-                                    </p>
-                                </div>
-                                <div class="fr-input-group fr-col-12 fr-col-md-6">
-                                    <label for="user_edit_email" class="fr-label">Courriel</label>
-                                    <input type="email" id="user_edit_email" name="user_edit[email]"
-                                        required="required" class="fr-input fr-input-email"
-                                        data-token="{{ csrf_token('partner_checkmail') }}">
-                                    <span class="fr-hint-text">Un e-mail d'activation du compte sera envoyé à cette adresse e-mail.</span>
-                                    <p class="fr-error-text fr-hidden">
-                                        Courriel invalide
-                                    </p>
-                                </div>
-                            </div>
-                            <div class="fr-grid-row fr-grid-row--gutters">
-                                <div class="fr-col-12">
-                                    <fieldset class="fr-fieldset">
-                                        <legend class="fr-fieldset__legend fr-fieldset__legend--regular">
-                                            Recevoir les e-mails ?
-                                            <span class="fr-hint-text">Si vous cochez oui, des e-mails concernant les signalements seront envoyés à cette adresse.</span>
-                                        </legend>
-                                        <div class="fr-fieldset__element fr-fieldset__element--inline">
-                                            <div class="fr-radio-group">
-                                                <input type="radio" id="user_edit_is_mailing_active-1" value='1' name="user_edit[isMailingActive]">
-                                                <label class="fr-label" for="user_edit_is_mailing_active-1">
-                                                    Oui
-                                                </label>
-                                            </div>
-                                        </div>
-                                        <div class="fr-fieldset__element fr-fieldset__element--inline">
-                                            <div class="fr-radio-group">
-                                                <input type="radio" id="user_edit_is_mailing_active-2" value='0' name="user_edit[isMailingActive]">
-                                                <label class="fr-label" for="user_edit_is_mailing_active-2">
-                                                    Non
-                                                </label>
-                                            </div>
-                                        </div>
-                                    </fieldset>
-                                </div>
-                            </div>
-                            {% if is_granted('ROLE_ADMIN_TERRITORY') %}
-                            <div class="fr-grid-row fr-grid-row--gutters">
-                                <div class="fr-col-12">
-                                    <fieldset id="user_edit_permission_affectation_toggle" class="fr-fieldset" aria-labelledby="user-edit-permissions-legend">
-                                        <legend class="fr-mb-3v" id="user-edit-permissions-legend">
-                                            Droits d'affectation
-                                        </legend>
-                                        <div class="fr-fieldset__element">
-                                            <ul class="fr-toggle__list">
-                                                <li>
-                                                    <div class="fr-toggle">
-                                                        <input type="checkbox" class="fr-toggle__input" id="user_edit_permission_affectation" name="user_edit[hasPermissionAffectation]" value="1">
-                                                        <label class="fr-toggle__label" for="user_edit_permission_affectation" data-fr-checked-label="Activé" data-fr-unchecked-label="Désactivé">Cet utilisateur peut affecter d'autres partenaires à ses signalements</label>
-                                                    </div>
-                                                    <div id="user_edit_permission_affectation_text" class="fr-alert fr-alert--info fr-alert--sm fr-mt-2v" class="fr-hidden">
-                                                        <p>Les responsables de territoire ont le droit d'affecter des partenaires aux signalements du territoire. Ce droit ne peut pas leur être retiré.</p>
-                                                    </div>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </fieldset>
-                                </div>
-                            </div>
-                            {% endif %}
-                            <input type="hidden" name="user_id" id="user_edit_userid">
-                            <input type="hidden" name="redirect_to" value="{{ currentPage }}">
-                            <input type="hidden" name="_token" value="{{ csrf_token('partner_user_edit') }}">
-                        </form>
+                        <div id="fr-modal-user-edit-form-container">Chargement en cours...</div>
                     </div>
                     <div class="fr-modal__footer">
                         <ul class="fr-btns-group fr-btns-group--right fr-btns-group--inline-reverse fr-btns-group--inline-lg fr-btns-group--icon-left">
                             <li>
-                                <button class="fr-btn fr-icon-check-line" form="user_edit_form"
-                                        id="user_edit_form_submit">
+                                <button class="fr-btn fr-icon-check-line" form="fr-modal-user-edit-form" type="submit">
                                     Enregistrer
                                 </button>
                             </li>
                             <li>
-                                <button class="fr-btn fr-btn--secondary fr-icon-close-line"
-                                        aria-controls="fr-modal-user-edit" type="button">
+                                <button class="fr-btn fr-btn--secondary fr-icon-close-line" aria-controls="fr-modal-user-edit" type="button">
                                     Annuler
                                 </button>
                             </li>
diff --git a/templates/_partials/_modal_user_edit_form.html.twig b/templates/_partials/_modal_user_edit_form.html.twig
new file mode 100755
index 000000000..083ce0808
--- /dev/null
+++ b/templates/_partials/_modal_user_edit_form.html.twig
@@ -0,0 +1,33 @@
+{% form_theme formUserPartner 'form/dsfr_theme.html.twig' %}
+{{ form_start(formUserPartner, {'attr': {'id': 'fr-modal-user-edit-form'}}) }}
+{{ form_errors(formUserPartner) }}
+<div class="fr-grid-row fr-grid-row--gutters">
+    <div class="fr-col-6">
+        {{ form_row(formUserPartner.nom) }}
+    </div>
+    <div class="fr-col-6">
+        {{ form_row(formUserPartner.prenom) }}
+    </div>
+    <div class="fr-col-6">
+        {{ form_row(formUserPartner.role) }}
+    </div>
+    <div class="fr-col-6">
+        {{ form_row(formUserPartner.email) }}
+        <span class="fr-hint-text">Un e-mail d'activation du compte sera envoyé à cette adresse e-mail.</span>
+    </div>
+    <div class="fr-col-12">
+        {{ form_row(formUserPartner.isMailingActive) }}
+    </div>
+    {% if formUserPartner.hasPermissionAffectation is defined %}
+        <div class="fr-col-12">
+            <label class="fr-label fr-pb-1w">Droits d'affectation</label>
+            <div id="user_partner_permission_affectation_toggle">
+                {{ form_row(formUserPartner.hasPermissionAffectation) }}
+            </div>
+            <div id="user_partner_permission_affectation_text" class="fr-alert fr-alert--info fr-alert--sm fr-mt-2v" class="fr-hidden">
+                <p>Les responsables de territoire ont le droit d'affecter des partenaires aux signalements du territoire. Ce droit ne peut pas leur être retiré.</p>
+            </div>
+        </div>
+    {% endif %}
+    {{ form_end(formUserPartner) }}
+</div>
\ No newline at end of file
diff --git a/templates/back/partner/view.html.twig b/templates/back/partner/view.html.twig
index 053cb62e8..901d73251 100755
--- a/templates/back/partner/view.html.twig
+++ b/templates/back/partner/view.html.twig
@@ -12,7 +12,7 @@
         {% include '_partials/_old_modal_user_create.html.twig' %}
     {% endif %}
     {% include '_partials/_modal_user_delete.html.twig' %}
-    {% include '_partials/_modal_user_edit.html.twig' with { 'currentPage': 'partnerEdit' } %}
+    {% include '_partials/_modal_user_edit.html.twig' %}
     <section class="fr-p-5v">
         {% if is_granted('ROLE_ADMIN_TERRITORY') %}
             {% include 'back/breadcrumb_bo.html.twig' with {
@@ -254,17 +254,10 @@
                         <td class="fr-text--right">
                             {% if is_granted('USER_EDIT', user) %}
                                 <a href="#" class="fr-btn fr-fi-edit-line fr-mt-3v btn-edit-partner-user"
-                                    id="partner_users_edit_{{ user.id }}" aria-controls="fr-modal-user-edit"
+                                    aria-controls="fr-modal-user-edit"
                                     data-fr-opened="false"
-                                    data-usernom="{{ user.nom }}"
-                                    data-userprenom="{{ user.prenom }}"
-                                    data-userrole="{{ user.roles[0] }}"
-                                    {% if is_granted('ASSIGN_PERMISSION_AFFECTATION', partner) %}
-                                    data-userpermissionaffectation="{{ user.hasPermissionAffectation() ? '1' : '0' }}"
-                                    {% endif %}
-                                    data-userismailingactive="{{ user.isMailingActive }}"
-                                    data-userid="{{ user.id }}"
-                                    data-useremail="{{ user.email }}">
+                                    data-refresh-url="{{ path('back_partner_user_edit',{partner:partner.id, user:user.id}) }}?from=partner"
+                                    >
                                 </a>
                             {% endif %}
                             {% if is_granted('USER_TRANSFER', user) and app.request.get('_route') is not same as('back_partner_new') %}
diff --git a/templates/back/user/index.html.twig b/templates/back/user/index.html.twig
index 947601454..30ab3f29f 100755
--- a/templates/back/user/index.html.twig
+++ b/templates/back/user/index.html.twig
@@ -3,7 +3,7 @@
 {% block title %}Liste des utilisateurs{% endblock %}
 
 {% block content %}
-    {% include '_partials/_modal_user_edit.html.twig' with { 'currentPage': 'userList' } %}
+    {% include '_partials/_modal_user_edit.html.twig' %}
     <section class="fr-p-5v">
         {% include 'back/breadcrumb_bo.html.twig' with {
             'level2Title': 'Outils admin',
@@ -139,16 +139,10 @@
                     <td class="fr-text--right">
                         {% if user.getPartners|length %}
                             <a href="#" class="fr-btn fr-fi-edit-line fr-mt-3v btn-edit-partner-user"
-                                id="partner_users_edit_{{ user.id }}" aria-controls="fr-modal-user-edit"
+                                aria-controls="fr-modal-user-edit"
                                 data-fr-opened="false"
-                                data-submit-url="{{ path('back_partner_user_edit', {'id': user.getPartners.first.id}) }}"
-                                data-usernom="{{ user.nom }}"
-                                data-userprenom="{{ user.prenom }}"
-                                data-userrole="{{ user.roles[0] }}"
-                                data-userpermissionaffectation="{{ user.hasPermissionAffectation() ? '1' : '0' }}"
-                                data-userismailingactive="{{ user.isMailingActive }}"
-                                data-userid="{{ user.id }}"
-                                data-useremail="{{ user.email }}">
+                                data-refresh-url="{{ path('back_partner_user_edit',{partner:user.partners.first.id, user:user.id}) }}?from=users"
+                                >
                             </a>
                         {% endif %}
                     </td>
diff --git a/tests/Functional/Controller/PartnerControllerTest.php b/tests/Functional/Controller/PartnerControllerTest.php
index 7eb78dea0..e6309f417 100644
--- a/tests/Functional/Controller/PartnerControllerTest.php
+++ b/tests/Functional/Controller/PartnerControllerTest.php
@@ -157,13 +157,15 @@ public function testAddNewAgentToPartner(string $email, string $expected)
                 ],
             ]
         );
+        $this->assertResponseStatusCodeSame(200);
+        $this->assertResponseHeaderSame('content-type', 'application/json');
+        $response = json_decode($this->client->getResponse()->getContent(), true);
         if ('redirect' === $expected) {
-            $this->assertResponseRedirects('/bo/partenaires/'.$partner->getId().'/voir#agents');
+            $this->assertArrayHasKey('redirect', $response);
+            $this->assertArrayHasKey('url', $response);
+            $this->assertStringEndsWith('/bo/partenaires/'.$partner->getId().'/voir#agents', $response['url']);
             $this->assertEmailCount(1);
         } else {
-            $this->assertResponseStatusCodeSame(200);
-            $this->assertResponseHeaderSame('content-type', 'application/json');
-            $response = json_decode($this->client->getResponse()->getContent(), true);
             $this->assertArrayHasKey('content', $response);
             $this->assertStringContainsString($expected, $response['content']);
         }
@@ -205,13 +207,15 @@ public function testAddExistingAgentToPartner(string $email, string $expected)
                 ],
             ]
         );
+        $this->assertResponseStatusCodeSame(200);
+        $this->assertResponseHeaderSame('content-type', 'application/json');
+        $response = json_decode($this->client->getResponse()->getContent(), true);
         if ('redirect' === $expected) {
-            $this->assertResponseRedirects('/bo/partenaires/'.$partner->getId().'/voir#agents');
+            $this->assertArrayHasKey('redirect', $response);
+            $this->assertArrayHasKey('url', $response);
+            $this->assertStringEndsWith('/bo/partenaires/'.$partner->getId().'/voir#agents', $response['url']);
             $this->assertEmailCount(1);
         } else {
-            $this->assertResponseStatusCodeSame(200);
-            $this->assertResponseHeaderSame('content-type', 'application/json');
-            $response = json_decode($this->client->getResponse()->getContent(), true);
             $this->assertArrayHasKey('content', $response);
             $this->assertStringContainsString($expected, $response['content']);
         }
@@ -261,31 +265,53 @@ public function testAddUserToPartner()
         $this->assertEmailCount(1);
     }
 
-    public function testEditUserOfPartner()
+    /**
+     * @dataProvider provideAgentEmailToEdit
+     */
+    public function testEditUserOfPartner(string $email, string $expected, int $nbEmailSent)
     {
         /** @var User $partnerUser */
         $partnerUser = $this->userRepository->findOneBy(['email' => 'user-13-01@histologe.fr']);
         $partner = $partnerUser->getPartners()->first();
 
-        $route = $this->router->generate('back_partner_user_edit', ['id' => $partner->getId()]);
+        $route = $this->router->generate('back_partner_user_edit', ['partner' => $partner->getId(), 'user' => $partnerUser->getId()]);
         $this->client->request(
             'POST',
             $route,
             [
-                'user_edit' => [
-                    'roles' => 'ROLE_USER_PARTNER',
+                'user_partner' => [
+                    'role' => 'ROLE_USER_PARTNER',
                     'prenom' => 'John',
                     'nom' => 'Doe',
-                    'email' => 'ajout.partner@histologe.fr',
-                    'isMailingActive' => false,
+                    'email' => $email,
+                    'isMailingActive' => 0,
+                    '_token' => $this->generateCsrfToken($this->client, 'user_partner'),
                 ],
-                'user_id' => $partnerUser->getId(),
-                '_token' => $this->generateCsrfToken($this->client, 'partner_user_edit'),
             ]
         );
+        $this->assertResponseStatusCodeSame(200);
+        $this->assertResponseHeaderSame('content-type', 'application/json');
+        $response = json_decode($this->client->getResponse()->getContent(), true);
+        if ('redirect' === $expected) {
+            $this->assertArrayHasKey('redirect', $response);
+            $this->assertArrayHasKey('url', $response);
+            $this->assertStringEndsWith('/bo/partenaires/'.$partner->getId().'/voir#agents', $response['url']);
+            $this->assertEmailCount($nbEmailSent);
+        } else {
+            $this->assertArrayHasKey('content', $response);
+            $this->assertStringContainsString($expected, $response['content']);
+            $this->assertEmailCount($nbEmailSent);
+        }
+    }
 
-        $this->assertResponseRedirects('/bo/partenaires/'.$partner->getId().'/voir#agents');
-        $this->assertEmailCount(1);
+    public function provideAgentEmailToEdit(): \Generator
+    {
+        yield 'Invalid email' => ['nanana', 'L&#039;adresse e-mail est invalide.', 0];
+        yield 'Partner email already exists' => ['partenaire-13-02@histologe.fr', 'Un partenaire existe déjà avec cette adresse e-mail.', 0];
+        yield 'User email already' => ['user-44-02@histologe.fr', 'Un utilisateur existe déjà avec cette adresse e-mail.', 0];
+
+        yield 'Original email' => ['user-13-01@histologe.fr', 'redirect', 0];
+        yield 'Changed email' => ['new.email@test.com', 'redirect', 1];
     }
 
     public function testEditAnonymizedUser()
@@ -294,20 +320,19 @@ public function testEditAnonymizedUser()
         $partnerUser = $this->userRepository->findAnonymizedUsers()[0];
         $partner = $partnerUser->getPartners()->first();
 
-        $route = $this->router->generate('back_partner_user_edit', ['id' => $partner->getId()]);
+        $route = $this->router->generate('back_partner_user_edit', ['partner' => $partner->getId(), 'user' => $partnerUser->getId()]);
         $this->client->request(
             'POST',
             $route,
             [
-                'user_edit' => [
-                    'roles' => 'ROLE_USER_PARTNER',
+                'user_partner' => [
+                    'role' => 'ROLE_USER_PARTNER',
                     'prenom' => 'John',
                     'nom' => 'Doe',
                     'email' => 'ajout.partner@histologe.fr',
-                    'isMailingActive' => false,
+                    'isMailingActive' => 0,
+                    '_token' => $this->generateCsrfToken($this->client, 'user_partner'),
                 ],
-                'user_id' => $partnerUser->getId(),
-                '_token' => $this->generateCsrfToken($this->client, 'partner_user_edit'),
             ]
         );
         $this->assertResponseStatusCodeSame(403);