diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce9fe509f..b3b7f67c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,15 @@ and this project adheres to
 * [person] accompanying course work: fix on-the-fly update of thirdParty 
 * [on-the-fly] close modal only after validation
 * [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
+* change order for accompanying course work list
+* [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432)
+* ajoute un ordre dans les localisation (api)
 
 
+## Test releases
+
+### test release 2021-02-01
+>>>>>>> master
 
 * renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
 * renomme date de début en date d'ouverture dans le formulaire parcours
@@ -35,9 +42,6 @@ and this project adheres to
 * [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
 * [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
 
-
-## Test releases
-
 ### test release 2021-01-31
 
 * [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index d46136173..3858979ef 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -220,7 +220,7 @@ final class ActivityController extends AbstractController
             $this->entityManager->persist($entity);
             $this->entityManager->flush();
 
-            if ($form->has('gendocTemplateId') && '' !== $form['gendocTemplateId']) {
+            if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
                 return $this->redirectToRoute(
                     'chill_docgenerator_generate_from_template',
                     [
@@ -437,7 +437,7 @@ final class ActivityController extends AbstractController
             $this->entityManager->persist($entity);
             $this->entityManager->flush();
 
-            if ($form->has('gendocTemplateId') && '' !== $form['gendocTemplateId']) {
+            if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
                 return $this->redirectToRoute(
                     'chill_docgenerator_generate_from_template',
                     [
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index 8966ecca8..05dc362b4 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -97,7 +97,6 @@ class CalendarType extends AbstractType
                     return $res;
                 },
                 static function (?string $dateAsString): DateTimeImmutable {
-
                     return new DateTimeImmutable($dateAsString);
                 }
             ));
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
index 0a1942f6d..6c664b314 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
@@ -8,14 +8,13 @@
             </div>
             <div class="col-8">
                 <h3>{{ document.title }}</h3>
-                <small>{{ document.object.type }}</small>
-            
+
                 {% if document.description is not empty %}
                     <blockquote class="chill-user-quote mt-2">
                         {{ document.description }}
                     </blockquote>
                 {% endif %}
-        
+
             </div>
         </div>
     </div>
@@ -32,6 +31,13 @@
 
 {% if display_action is defined and display_action == true %}
     <ul class="record_actions">
+        {% if document.course != null and is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', document.course) %}
+            <li>
+                <a href="{{ path('chill_person_accompanying_course_index', {'accompanying_period_id': document.course.id}) }}" class="btn btn-show change-icon">
+                    <i class="fa fa-random"></i> {{ 'Course number'|trans }} {{ document.course.id }}
+                </a>
+            </li>
+        {% endif %}
         <li>
             {{ m.download_button(document.object, document.title) }}
         </li>
@@ -43,19 +49,25 @@
                 'changeClass'   string
                 'noText'        boolean
             #}
-            {# vue component #}
+            {# vue component
             <span
                 data-module="wopi-link"
                 data-wopi-url="{{ path('chill_wopi_file_edit', {'fileId': document.object.uuid}) }}"
                 data-doc-title="{{ document.title|e('html_attr') }}"
                 data-doc-type="{{ document.object.type|e('html_attr') }}"
                 data-button="{{ button|json_encode }}"
-            ></span>
+            ></span> #}
+            <a class="btn btn-update" href="{{ chill_path_add_return_path('chill_wopi_file_edit', {'fileId': document.object.uuid}) }}">{{ 'Edit'|trans }}</a>
         {% else %}
             <a class="btn btn-update change-icon disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
                 <i class="fa fa-lock me-2"></i>{{ 'Update document'|trans }}
             </a>
         {% endif %}
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
+            <li>
+                <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': document.course.id, 'id': document.id}) }}" class="btn btn-show"></a>
+            </li>
+        {% endif %}
         </li>
     </ul>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
index 250d92980..2cf5caaf9 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -19,7 +21,7 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class LocationApiController extends ApiController
 {
-    public function customizeQuery(string $action, Request $request, $query): void
+    protected function customizeQuery(string $action, Request $request, $query): void
     {
         $query
             ->leftJoin('e.locationType', 'lt')
@@ -31,4 +33,14 @@ class LocationApiController extends ApiController
                 )
             );
     }
+
+    /**
+     * @param QueryBuilder $query
+     * @param mixed $_format
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
+    {
+        return $query
+            ->addOrderBy('e.name', 'ASC');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
index 52f58ed68..af9e1b2b1 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
@@ -236,6 +236,10 @@ class NotificationController extends AbstractController
                         '_fragment' => 'comment-' . $commentId,
                     ]);
                 }
+
+                if ($editedCommentForm->isSubmitted() && !$editedCommentForm->isValid()) {
+                    $this->addFlash('error', $this->translator->trans('This form contains errors'));
+                }
             }
         }
 
@@ -257,6 +261,10 @@ class NotificationController extends AbstractController
                         'id' => $notification->getId(),
                     ]);
                 }
+
+                if ($appendCommentForm->isSubmitted() && !$appendCommentForm->isValid()) {
+                    $this->addFlash('error', $this->translator->trans('This form contains errors'));
+                }
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
index 01911c729..5275010e6 100644
--- a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
@@ -18,6 +18,7 @@ use DateTimeInterface;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
@@ -28,6 +29,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
 {
     /**
      * @ORM\Column(type="text")
+     * @Assert\NotBlank(message="notification.Comment content might not be blank")
      */
     private string $content = '';
 
@@ -136,9 +138,9 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         $this->recentlyPersisted = true;
     }
 
-    public function setContent(string $content): self
+    public function setContent(?string $content): self
     {
-        $this->content = $content;
+        $this->content = (string) $content;
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
index e04a96af0..ce5587ed9 100644
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
@@ -79,11 +79,8 @@ class NotificationMailer
                 continue;
             }
 
-            $email = new Email();
-            $email
-                ->subject($notification->getTitle());
-
             if ($notification->isSystem()) {
+                $email = new Email();
                 $email
                     ->text($notification->getMessage());
             } else {
@@ -96,7 +93,9 @@ class NotificationMailer
                     ]);
             }
 
-            $email->to($addressee->getEmail());
+            $email
+                ->subject($notification->getTitle())
+                ->to($addressee->getEmail());
 
             try {
                 $this->mailer->send($email);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
index e74cd7ef2..826917fbb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
@@ -47,7 +47,8 @@ export default {
             console.log('goToGenerateWorkflow', event, workflowName);
 
             if (!this.$props.preventDefaultMoveToGenerate) {
-                event.target.click();
+                console.log('to go generate');
+                window.location.assign(this.makeLink(workflowName));
             }
 
             this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName)});
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index c1eac0b06..0f2b52568 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -91,11 +91,11 @@ export const multiSelectMessages = {
     multiselect: {
       placeholder: 'Choisir',
       tag_placeholder: 'Créer un nouvel élément',
-      select_label: 'Appuyer sur "Entrée" pour sélectionner',
-      deselect_label: 'Appuyer sur "Entrée" pour désélectionner',
+      select_label: '"Entrée" ou cliquez pour sélectionner',
+      deselect_label: '"Entrée" ou cliquez pour désélectionner',
       select_group_label: 'Appuyer sur "Entrée" pour sélectionner ce groupe',
       deselect_group_label: 'Appuyer sur "Entrée" pour désélectionner ce groupe',
       selected_label: 'Sélectionné'
     }
   }
-};
\ No newline at end of file
+};
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig
index b741abf4a..121111b03 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig
@@ -15,11 +15,11 @@
 
 <div class="notification-comment-list my-5">
     <h2 class="chill-blue">{{ 'notification.comments_list'|trans }}</h2>
-    
+
     {% if notification.comments|length > 0 %}
         <div class="flex-table">
             {% for comment in notification.comments %}
-                
+
                 {% if editedCommentForm is null or editedCommentId != comment.id %}
                     {{ m.show_comment(comment, {
                         'recordAction': _self.recordAction(comment)
@@ -28,10 +28,11 @@
                     <div class="item-bloc">
                         <div class="item-row row">
                             <a id="comment-{{ comment.id }}"></a>
-                            
+
                             {{ form_start(editedCommentForm) }}
                             {{ form_errors(editedCommentForm) }}
                             {{ form_widget(editedCommentForm.content) }}
+                            {{ form_errors(editedCommentForm.content) }}
                             <input type="hidden" name="form" value="edit" />
                             <ul class="record_actions">
                                 <li class="cancel">
@@ -46,24 +47,25 @@
                                 </li>
                             </ul>
                             {{ form_end(editedCommentForm) }}
-                        
+
                         </div>
                     </div>
                 {% endif %}
-            
+
             {% endfor %}
         </div>
     {% else %}
         <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
     {% endif %}
-    
+
     {% if appendCommentForm is not null %}
         <div class="new-comment my-5">
             <h2 class="chill-blue mb-4">{{ 'Write a new comment'|trans }}</h2>
-            
+
             {{ form_start(appendCommentForm) }}
             {{ form_errors(appendCommentForm) }}
             {{ form_widget(appendCommentForm.content) }}
+            {{ form_errors(appendCommentForm.content) }}
             <input type="hidden" name="form" value="append" />
             <ul class="record_actions">
                 <li>
@@ -71,7 +73,7 @@
                 </li>
             </ul>
             {{ form_end(appendCommentForm) }}
-        
+
         </div>
     {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php b/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
index 6a61e7de4..41ffd63c2 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
@@ -16,16 +16,16 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowStepRepository;
 use Chill\MainBundle\Templating\UI\NotificationCounterInterface;
 use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Workflow\Event\Event;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 final class WorkflowByUserCounter implements NotificationCounterInterface, EventSubscriberInterface
 {
-    private EntityWorkflowStepRepository $workflowStepRepository;
-
     private CacheItemPoolInterface $cacheItemPool;
 
+    private EntityWorkflowStepRepository $workflowStepRepository;
+
     public function __construct(EntityWorkflowStepRepository $workflowStepRepository, CacheItemPoolInterface $cacheItemPool)
     {
         $this->workflowStepRepository = $workflowStepRepository;
@@ -54,14 +54,21 @@ final class WorkflowByUserCounter implements NotificationCounterInterface, Event
         return $nb;
     }
 
+    public static function generateCacheKeyWorkflowByUser(User $user): string
+    {
+        return 'chill_main_workflow_by_u_' . $user->getId();
+    }
+
     public function getCountUnreadByUser(User $user): int
     {
         return $this->workflowStepRepository->countUnreadByUser($user);
     }
 
-    public static function generateCacheKeyWorkflowByUser(User $user): string
+    public static function getSubscribedEvents()
     {
-        return 'chill_main_workflow_by_u_'.$user->getId();
+        return [
+            'workflow.leave' => 'resetWorkflowCache',
+        ];
     }
 
     public function resetWorkflowCache(Event $event): void
@@ -74,11 +81,12 @@ final class WorkflowByUserCounter implements NotificationCounterInterface, Event
         $entityWorkflow = $event->getSubject();
         $step = $entityWorkflow->getCurrentStep();
 
-        if ($step === null) {
+        if (null === $step) {
             return;
         }
 
         $keys = [];
+
         foreach ($step->getDestUser() as $user) {
             $keys[] = self::generateCacheKeyWorkflowByUser($user);
         }
@@ -86,15 +94,5 @@ final class WorkflowByUserCounter implements NotificationCounterInterface, Event
         if ([] !== $keys) {
             $this->cacheItemPool->deleteItems($keys);
         }
-
     }
-
-    public static function getSubscribedEvents()
-    {
-        return [
-            'workflow.leave' => 'resetWorkflowCache',
-        ];
-    }
-
-
 }
diff --git a/src/Bundle/ChillMainBundle/translations/validators.fr.yml b/src/Bundle/ChillMainBundle/translations/validators.fr.yml
index 7bd943f25..33973f9d7 100644
--- a/src/Bundle/ChillMainBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/validators.fr.yml
@@ -27,4 +27,4 @@ address:
 notification:
     At least one addressee: Indiquez au moins un destinataire
     Title must be defined: Un titre doit être indiqué
-
+    Comment content might not be blank: Le commentaire ne peut pas être vide
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
index 7e7b9a0c2..ec5db6222 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -23,7 +24,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseWorkController extends AbstractController
 {
@@ -60,7 +61,7 @@ class AccompanyingCourseWorkController extends AbstractController
      */
     public function createWork(AccompanyingPeriod $period): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::CREATE, $period);
 
         if ($period->getSocialIssues()->count() === 0) {
             $this->addFlash(
@@ -93,7 +94,8 @@ class AccompanyingCourseWorkController extends AbstractController
      */
     public function deleteWork(AccompanyingPeriodWork $work, Request $request): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::UPDATE, $work);
+
         $em = $this->getDoctrine()->getManager();
 
         $form = $this->createDeleteForm($work->getId());
@@ -138,7 +140,8 @@ class AccompanyingCourseWorkController extends AbstractController
      */
     public function editWork(AccompanyingPeriodWork $work): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::UPDATE, $work);
+
         $json = $this->serializer->normalize($work, 'json', ['groups' => ['read']]);
 
         return $this->render('@ChillPerson/AccompanyingCourseWork/edit.html.twig', [
@@ -157,13 +160,13 @@ class AccompanyingCourseWorkController extends AbstractController
      */
     public function listWorkByAccompanyingPeriod(AccompanyingPeriod $period): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::SEE, $period);
+
         $totalItems = $this->workRepository->countByAccompanyingPeriod($period);
         $paginator = $this->paginator->create($totalItems);
 
-        $works = $this->workRepository->findByAccompanyingPeriod(
+        $works = $this->workRepository->findByAccompanyingPeriodOpenFirst(
             $period,
-            ['startDate' => 'DESC', 'endDate' => 'DESC'],
             $paginator->getItemsPerPage(),
             $paginator->getCurrentPageFirstItemNumber()
         );
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index dff4ee38f..b7e8d1c5d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -44,8 +44,8 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 {
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
-     * @Serializer\Groups({"read","read:accompanyingPeriodWork:light"})
-     * @Serializer\Context(normalizationContext={"groups"={"read"}}, groups={"read:accompanyingPeriodWork:light"})
+     * @Serializer\Groups({"read", "read:accompanyingPeriodWork:light"})
+     * @Serializer\Context(normalizationContext={"groups": {"read"}}, groups={"read:accompanyingPeriodWork:light"})
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 0efbf9ac3..827dfb0a6 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -13,7 +13,10 @@ namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -24,15 +27,18 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
     protected Registry $registry;
 
+    protected Security $security;
+
     /**
      * @var TranslatorInterface
      */
     protected $translator;
 
-    public function __construct(TranslatorInterface $translator, Registry $registry)
+    public function __construct(TranslatorInterface $translator, Registry $registry, Security $security)
     {
         $this->translator = $translator;
         $this->registry = $registry;
+        $this->security = $security;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
@@ -47,38 +53,44 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
             ], ])
             ->setExtras(['order' => 10]);
 
-        $menu->addChild($this->translator->trans('Edit Accompanying Course'), [
-            'route' => 'chill_person_accompanying_course_edit',
-            'routeParameters' => [
-                'accompanying_period_id' => $period->getId(),
-            ], ])
-            ->setExtras(['order' => 20]);
+        if ($this->security->isGranted(AccompanyingPeriodVoter::EDIT, $period)) {
+            $menu->addChild($this->translator->trans('Edit Accompanying Course'), [
+                'route' => 'chill_person_accompanying_course_edit',
+                'routeParameters' => [
+                    'accompanying_period_id' => $period->getId(),
+                ], ])
+                ->setExtras(['order' => 20]);
+        }
 
         if (AccompanyingPeriod::STEP_DRAFT === $period->getStep()) {
             // no more menu items if the period is draft
             return;
         }
 
-        $menu->addChild($this->translator->trans('Accompanying Course History'), [
-            'route' => 'chill_person_accompanying_course_history',
-            'routeParameters' => [
-                'accompanying_period_id' => $period->getId(),
-            ], ])
-            ->setExtras(['order' => 30]);
+        if ($this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $period)) {
+            $menu->addChild($this->translator->trans('Accompanying Course History'), [
+                'route' => 'chill_person_accompanying_course_history',
+                'routeParameters' => [
+                    'accompanying_period_id' => $period->getId(),
+                ], ])
+                ->setExtras(['order' => 30]);
 
-        $menu->addChild($this->translator->trans('Accompanying Course Action'), [
-            'route' => 'chill_person_accompanying_period_work_list',
-            'routeParameters' => [
-                'id' => $period->getId(),
-            ], ])
-            ->setExtras(['order' => 40]);
+            $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
+                'route' => 'chill_person_accompanying_period_comment_list',
+                'routeParameters' => [
+                    'accompanying_period_id' => $period->getId(),
+                ], ])
+                ->setExtras(['order' => 50]);
+        }
 
-        $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
-            'route' => 'chill_person_accompanying_period_comment_list',
-            'routeParameters' => [
-                'accompanying_period_id' => $period->getId(),
-            ], ])
-            ->setExtras(['order' => 50]);
+        if ($this->security->isGranted(AccompanyingPeriodWorkVoter::SEE, $period)) {
+            $menu->addChild($this->translator->trans('Accompanying Course Action'), [
+                'route' => 'chill_person_accompanying_period_work_list',
+                'routeParameters' => [
+                    'id' => $period->getId(),
+                ], ])
+                ->setExtras(['order' => 40]);
+        }
 
         $workflow = $this->registry->get($period, 'accompanying_period_lifecycle');
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
index 70e972aa5..9e67da458 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
@@ -16,17 +16,22 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use DateTimeImmutable;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
 final class AccompanyingPeriodWorkRepository implements ObjectRepository
 {
+    private EntityManagerInterface $em;
+
     private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
+        $this->em = $entityManager;
         $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
     }
 
@@ -78,6 +83,36 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
         return $this->repository->findByAccompanyingPeriod($period, $orderBy, $limit, $offset);
     }
 
+    /**
+     * Return a list of accompanying period with a defined order:.
+     *
+     * * first, opened works
+     * * then, closed works
+     *
+     * @return AccompanyingPeriodWork[]
+     */
+    public function findByAccompanyingPeriodOpenFirst(AccompanyingPeriod $period, int $limit = 10, int $offset = 0): array
+    {
+        $rsm = new ResultSetMappingBuilder($this->em);
+        $rsm->addRootEntityFromClassMetadata(AccompanyingPeriodWork::class, 'w');
+
+        $sql = "SELECT {$rsm} FROM chill_person_accompanying_period_work w
+                     WHERE accompanyingPeriod_id = :periodId
+                     ORDER BY
+                         CASE WHEN enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
+                         startdate DESC,
+                         enddate DESC,
+                         id DESC
+        LIMIT :limit OFFSET :offset";
+
+        $nq = $this->em->createNativeQuery($sql, $rsm)
+            ->setParameter('periodId', $period->getId(), Types::INTEGER)
+            ->setParameter('limit', $limit, Types::INTEGER)
+            ->setParameter('offset', $offset, Types::INTEGER);
+
+        return $nq->getResult();
+    }
+
     public function findNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until, int $limit = 20, int $offset = 0): array
     {
         return $this->buildQueryNearEndDateByUser($user, $since, $until)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index faba287c5..d12bd1184 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -60,14 +60,14 @@
          <template v-slot:body>
             <p>{{ $t('confirm.sure_description') }}</p>
             <div v-if="accompanyingCourse.user === null">
-                <div v-if="filteredReferrersSuggested.length === 0">
+                <div v-if="usersSuggestedFilteredByJob.length === 0">
                    <p class="alert alert-warning">{{ $t('confirm.no_suggested_referrer') }}</p>
                 </div>
-                <div v-if="filteredReferrersSuggested.length === 1" class="alert alert-info">
+                <div v-if="usersSuggestedFilteredByJob.length === 1" class="alert alert-info">
                    <p>{{ $t('confirm.one_suggested_referrer') }}:</p>
                    <ul class="list-suggest add-items inline">
                      <li>
-                       <user-render-box-badge :user="filteredReferrersSuggested[0]"></user-render-box-badge>
+                       <user-render-box-badge :user="usersSuggestedFilteredByJob[0]"></user-render-box-badge>
                      </li>
                    </ul>
                    <p>{{ $t('confirm.choose_suggested_referrer') }}</p>
@@ -150,7 +150,6 @@ export default {
    computed: {
       ...mapState({
          accompanyingCourse: state => state.accompanyingCourse,
-         filteredReferrersSuggested: state => state.filteredReferrersSuggested
       }),
       ...mapGetters([
          'isParticipationValid',
@@ -160,15 +159,16 @@ export default {
          'isLocationValid',
          'isJobValid',
          'validationKeys',
-         'isValidToBeConfirmed'
+         'isValidToBeConfirmed',
+         'usersSuggestedFilteredByJob',
       ]),
       deleteLink() {
          return `/fr/parcours/${this.accompanyingCourse.id}/delete`; //TODO locale
       },
       disableConfirm() {
-         return this.clickedDoNotChooseReferrer
-               ? (this.accompanyingCourse.user === null && this.filteredReferrersSuggested.length === 0)
-               : (this.accompanyingCourse.user === null && this.filteredReferrersSuggested.length === 0) || (this.filteredReferrersSuggested.length === 1);
+        return (this.accompanyingCourse.user === null
+            && this.usersSuggestedFilteredByJob.length === 1
+            && this.clickedDoNotChooseReferrer === false);
       }
    },
    methods: {
@@ -183,7 +183,7 @@ export default {
             });
       },
       chooseSuggestedReferrer() {
-         this.$store.dispatch('updateReferrer', this.filteredReferrersSuggested[0])
+         this.$store.dispatch('updateReferrer', this.usersSuggestedFilteredByJob[0])
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
                   violations.forEach((violation) => this.$toast.open({message: violation}));
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index f8cf0ae0b..0d9465f3a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -1,164 +1,178 @@
 <template>
-<div class="vue-component">
-   <h2><a id="section-80"></a>{{ $t('referrer.title') }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-80"></a>{{ $t('referrer.title') }}</h2>
 
-   <div>
+    <div>
 
       <label class="col-form-label" for="selectJob">
-         {{ $t('job.label') }}
+        {{ $t('job.label') }}
       </label>
 
       <VueMultiselect
-         name="selectJob"
-         label="text"
-         :custom-label="customJobLabel"
-         track-by="id"
-         :multiple="false"
-         :searchable="true"
-         :placeholder="$t('job.placeholder')"
-         v-model="valueJob"
-         :options="jobs"
-         :select-label="$t('multiselect.select_label')"
-         :deselect-label="$t('multiselect.deselect_label')"
-         :selected-label="$t('multiselect.selected_label')"
-         @select="updateJob">
-      </VueMultiselect>
+          name="selectJob"
+          label="text"
+          :custom-label="customJobLabel"
+          track-by="id"
+          :multiple="false"
+          :searchable="true"
+          :placeholder="$t('job.placeholder')"
+          v-model="valueJob"
+          :options="jobs"
+          :select-label="$t('multiselect.select_label')"
+          :deselect-label="$t('multiselect.deselect_label')"
+          :selected-label="$t('multiselect.selected_label')"
+      ></VueMultiselect>
 
       <label class="col-form-label" for="selectReferrer">
-         {{ $t('referrer.label') }}
+        {{ $t('referrer.label') }}
       </label>
 
       <VueMultiselect
-         name="selectReferrer"
-         label="text"
-         track-by="id"
-         :multiple="false"
-         :searchable="true"
-         :placeholder="$t('referrer.placeholder')"
-         v-model="value"
-         :options="users"
-         :select-label="$t('multiselect.select_label')"
-         :deselect-label="$t('multiselect.deselect_label')"
-         :selected-label="$t('multiselect.selected_label')"
-         @select="updateReferrer">
-      </VueMultiselect>
+          name="selectReferrer"
+          label="text"
+          track-by="id"
+          :multiple="false"
+          :searchable="true"
+          :placeholder="$t('referrer.placeholder')"
+          v-model="value"
+          :options="users"
+          :select-label="$t('multiselect.select_label')"
+          :deselect-label="$t('multiselect.deselect_label')"
+          :selected-label="$t('multiselect.selected_label')"
+      ></VueMultiselect>
 
-      <template v-if="filteredReferrersSuggested.length > 0">
-         <ul class="list-suggest add-items inline">
-            <li v-for="(u, i) in filteredReferrersSuggested" @click="updateReferrer(u)" :key="`referrer-${i}`">
+      <template v-if="usersSuggestedFilteredByJob.length > 0">
+        <ul class="list-suggest add-items inline">
+          <li v-for="(u, i) in usersSuggestedFilteredByJob" @click="updateReferrer(u)" :key="`referrer-${i}`">
                <span>
                   <user-render-box-badge :user="u"></user-render-box-badge>
                </span>
-            </li>
+          </li>
         </ul>
       </template>
-   </div>
+    </div>
 
-   <div>
+    <div>
       <ul class="record_actions">
-         <li>
-            <button
-               class="btn btn-create"
-               type="button"
-               name="button"
-               @click="assignMe">
-               {{ $t('referrer.assign_me') }}
-            </button>
-         </li>
+        <li>
+          <button
+              class="btn btn-create"
+              type="button"
+              name="button"
+              @click="assignMe">
+            {{ $t('referrer.assign_me') }}
+          </button>
+        </li>
       </ul>
-   </div>
+    </div>
 
-   <div v-if="!isJobValid" class="alert alert-warning to-confirm">
+    <div v-if="!isJobValid" class="alert alert-warning to-confirm">
       {{ $t('job.not_valid') }}
-   </div>
+    </div>
 
-</div>
+  </div>
 </template>
 
 <script>
 import VueMultiselect from 'vue-multiselect';
-import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
-import { mapState, mapGetters } from 'vuex';
+import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods';
+import {mapState, mapGetters} from 'vuex';
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge";
 
 export default {
-   name: "Referrer",
-   components: {
-     UserRenderBoxBadge,
-     VueMultiselect,
-   },
-   data() {
-      return {
-         jobs: []
+  name: "Referrer",
+  components: {
+    UserRenderBoxBadge,
+    VueMultiselect,
+  },
+  data() {
+    return {
+      jobs: []
+    }
+  },
+  computed: {
+    ...mapState({
+      valueJob: state => state.accompanyingCourse.job,
+    }),
+    ...mapGetters(['isJobValid', 'usersSuggestedFilteredByJob']),
+    users: function () {
+      let users = this.$store.getters.usersFilteredByJob;
+
+      console.log('users filtered by job', users);
+
+      // ensure that the selected user is in the list. add it if necessary
+      if (this.$store.state.accompanyingCourse.user !== null && users.find(u => this.$store.state.accompanyingCourse.user.id === u.id) === undefined) {
+        console.log('add user to users');
+        users.push(this.$store.state.accompanyingCourse.user);
       }
-   },
-   computed: {
-      ...mapState({
-         value: state => state.accompanyingCourse.user,
-         valueJob: state => state.accompanyingCourse.job,
-         users: state => state.users.filter(u => {
-            if (u.user_job && state.accompanyingCourse.job) {
-                return u.user_job.id === state.accompanyingCourse.job.id;
-            } else {
-               return false;
-            }
-         }),
-         filteredReferrersSuggested: state => state.filteredReferrersSuggested,
-      }),
-      ...mapGetters([
-         'isJobValid'
-      ])
-   },
-   mounted() {
-      this.getJobs();
-   },
-   methods: {
-      updateReferrer(value) {
-         this.$store.dispatch('updateReferrer', value)
+
+      console.log('users to return', users);
+      return users;
+    },
+    valueJob: {
+      get() {
+        return this.$store.state.accompanyingCourse.job;
+      },
+      set(value) {
+        this.$store.dispatch('updateJob', value)
             .catch(({name, violations}) => {
-               if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
-               } else {
-                  this.$toast.open({message: 'An error occurred'})
-               }
+              if (name === 'ValidationException' || name === 'AccessException') {
+                violations.forEach((violation) => this.$toast.open({message: violation}));
+              } else {
+                this.$toast.open({message: 'An error occurred'})
+              }
             });
-      },
-      getJobs() {
-         const url = '/api/1.0/main/user-job.json';
-         makeFetch('GET', url)
-            .then(response => {
-               this.jobs  = response.results;
-            })
-            .catch((error) => {
-               this.$toast.open({message: error.txt})
-            })
-      },
-      updateJob(value) {
-         this.$store.dispatch('updateJob', value)
-            .catch(({name, violations}) => {
-               if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
-               } else {
-                  this.$toast.open({message: 'An error occurred'})
-               }
-            });
-      },
-      customJobLabel(value) {
-          return value.label.fr;
-      },
-      assignMe() {
-         const url = `/api/1.0/main/whoami.json`;
-         makeFetch('GET', url)
-            .then(response => {
-               this.$store.dispatch('updateReferrer', response);
-               return response;
-            })
-            .catch((error) => {
-               commit('catchError', error);
-               this.$toast.open({message: error.body})
-            })
       }
-   }
+    },
+    value: {
+      get() {
+        return this.$store.state.accompanyingCourse.user;
+      },
+      set(value) {
+        console.log('set referrer', value);
+        this.$store.dispatch('updateReferrer', value)
+            .catch(({name, violations}) => {
+              if (name === 'ValidationException' || name === 'AccessException') {
+                violations.forEach((violation) => this.$toast.open({message: violation}));
+              } else {
+                this.$toast.open({message: 'An error occurred'})
+              }
+            });
+      }
+    },
+  },
+  mounted() {
+    this.getJobs();
+  },
+  methods: {
+    updateReferrer(value) {
+      this.value = value;
+    },
+    getJobs() {
+      const url = '/api/1.0/main/user-job.json';
+      makeFetch('GET', url)
+          .then(response => {
+            this.jobs = response.results;
+          })
+          .catch((error) => {
+            this.$toast.open({message: error.txt})
+          })
+    },
+    customJobLabel(value) {
+      return value.label.fr;
+    },
+    assignMe() {
+      const url = `/api/1.0/main/whoami.json`;
+      makeFetch('GET', url)
+          .then(user => {
+            this.value = user
+          })
+      /*.catch((error) => {
+         commit('catchError', error);
+         this.$toast.open({message: error.body})
+      })*/
+    }
+  }
 }
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 87f6d8d09..49253eab8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -140,7 +140,7 @@ const appMessages = {
          sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
          ok: "Confirmer le parcours",
          delete: "Supprimer le parcours",
-         no_suggested_referrer: "Il n'y a aucun référent qui puisse être désigné pour ce parcours. Vérifiez la localisation du parcours, les métiers et service indiqués. Si le problème persiste, contactez l'administrateur du logiciel.",
+         no_suggested_referrer: "Il n'y a aucun référent qui puisse être suggéré pour ce parcours. Vérifiez la localisation du parcours, les métiers et service indiqués. Si les données sont correctes, vous pouvez confirmer ce parcours.",
          one_suggested_referrer: "Un unique référent peut être suggéré pour ce parcours",
          choose_suggested_referrer: "Voulez-vous le désigner directement ?",
          choose_button: "Désigner",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index ea8f3f556..0f682e86a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -40,7 +40,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             scopesAtBackend: accompanyingCourse.scopes.map(scope => scope),
             // the users which are available for referrer
             referrersSuggested: [],
-            filteredReferrersSuggested: [],
             // all the users available
             users: [],
             permissions: {}
@@ -93,6 +92,30 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
 
                return false;
             },
+            usersFilteredByJob(state) {
+               return state.users.filter(u => {
+                  if (null !== state.accompanyingCourse.job) {
+                     return (u.user_job === null ? null : u.user_job.id) === state.accompanyingCourse.job.id;
+                  } else {
+                     return true;
+                  }
+               });
+            },
+            usersSuggestedFilteredByJob(state) {
+               return state.referrersSuggested.filter(u => {
+                  if (null !== state.accompanyingCourse.job) {
+                     return (u.user_job === null ? null : u.user_job.id) === state.accompanyingCourse.job.id;
+                  } else {
+                     return true;
+                  }
+               }).filter(u => {
+                  if (null !== state.accompanyingCourse.user) {
+                     return u.id !== state.accompanyingCourse.user.id;
+                  }
+
+                  return true;
+               });
+            },
          },
          mutations: {
             catchError(state, error) {
@@ -216,22 +239,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   return u;
                });
             },
-            setFilteredReferrersSuggested(state) {
-               state.filteredReferrersSuggested = state.referrersSuggested.filter(u => {
-                  if (u.user_job && state.accompanyingCourse.job && state.accompanyingCourse.user) {
-                      return u.user_job.id === state.accompanyingCourse.job.id && state.accompanyingCourse.user.id !== u.id
-                  } else {
-                     if (null === state.accompanyingCourse.user) {
-                         if (u.user_job && state.accompanyingCourse.job) {
-                            return u.user_job.id === state.accompanyingCourse.job.id
-                         } else {
-                            return true;
-                         }
-                     }
-                     return state.accompanyingCourse.user.id !== u.id;
-                  }
-               })
-            },
             confirmAccompanyingCourse(state, response) {
                //console.log('### mutation: confirmAccompanyingCourse: response', response);
                state.accompanyingCourse.step = response.step;
@@ -689,8 +696,14 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   })
             },
             updateReferrer({ commit }, payload) {
+               console.log('update referrer', payload);
+               console.log('payload !== null', payload !== null);
                const url = `/api/1.0/person/accompanying-course/${id}.json`;
-               const body = { type: "accompanying_period", user: { id: payload.id, type: payload.type }};
+               let body = { type: "accompanying_period", user: null };
+
+               if (payload !== null) {
+                  body = { type: "accompanying_period", user: { id: payload.id, type: payload.type } };
+               }
 
                return makeFetch('PATCH', url, body)
                   .then((response) => {
@@ -704,12 +717,15 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             },
             updateJob({ commit }, payload) {
                const url = `/api/1.0/person/accompanying-course/${id}.json`;
-               const body = { type: "accompanying_period", job: { id: payload.id, type: payload.type }};
+               let body = { type: "accompanying_period", job: null };
+
+               if (payload !== null) {
+                  body = { type: "accompanying_period", job: { id: payload.id, type: payload.type } };
+               }
 
                return makeFetch('PATCH', url, body)
                   .then((response) => {
                      commit('updateJob', response.job);
-                     commit('setFilteredReferrersSuggested');
                   })
                   .catch((error) => {
                      commit('catchError', error);
@@ -734,7 +750,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             async fetchReferrersSuggested({ state, commit}) {
                let users = await getReferrersSuggested(state.accompanyingCourse);
                commit('setReferrersSuggested', users);
-               commit('setFilteredReferrersSuggested');
                if (
                   null === state.accompanyingCourse.user
                   && !state.accompanyingCourse.confidential
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index 7794a3e5f..d8125ef3e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -23,6 +23,8 @@
             </div>
         {% endif %}
 
+        {{ chill_pagination(paginator) }}
+
         <ul class="record_actions sticky-form-buttons">
             <li>
                 <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
index 5f12f60f1..72e635f7d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
@@ -41,7 +41,7 @@
                         {% endif %}
                     {% endif %}
                 </div>
-                <div class="wh-col">
+                <div class="wh-col" style="align-items: center;">
                     {% if chill_accompanying_periods.fields.user == 'visible'  %}
                         {# the tags `data-referrer-text` is used by module `@ChillPerson/mod/AccompanyingPeriod/setReferrer.js` #}
                         {% if period.user %}
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
index 279873fe5..039baafaa 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
@@ -11,17 +11,23 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Security\Authorization;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
 use UnexpectedValueException;
+use function get_class;
 use function in_array;
 
 class AccompanyingPeriodWorkVoter extends Voter
 {
+    public const CREATE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE';
+
     public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE';
 
+    public const UPDATE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE';
+
     private Security $security;
 
     public function __construct(Security $security)
@@ -31,8 +37,14 @@ class AccompanyingPeriodWorkVoter extends Voter
 
     protected function supports($attribute, $subject): bool
     {
-        return $subject instanceof AccompanyingPeriodWork
-            && in_array($attribute, $this->getRoles(), true);
+        return
+            (
+                $subject instanceof AccompanyingPeriodWork
+                && in_array($attribute, $this->getRoles(), true)
+            ) || (
+                $subject instanceof AccompanyingPeriod
+                && in_array($attribute, [self::SEE, self::CREATE], true)
+            );
     }
 
     /**
@@ -41,13 +53,28 @@ class AccompanyingPeriodWorkVoter extends Voter
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
-        switch ($attribute) {
-            case self::SEE:
-                return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod());
+        if ($subject instanceof AccompanyingPeriodWork) {
+            switch ($attribute) {
+                case self::SEE:
+                    return $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject->getAccompanyingPeriod());
 
-            default:
-                throw new UnexpectedValueException("attribute {$attribute} is not supported");
+                default:
+                    throw new UnexpectedValueException("attribute {$attribute} is not supported");
+            }
+        } elseif ($subject instanceof AccompanyingPeriod) {
+            switch ($attribute) {
+                case self::SEE:
+                    return $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject);
+
+                default:
+                    throw new UnexpectedValueException(sprintf(
+                        "attribute {$attribute} is not supported on instance %s",
+                        AccompanyingPeriod::class
+                    ));
+            }
         }
+
+        throw new UnexpectedValueException(sprintf("attribute {$attribute} on instance %s is not supported", get_class($subject)));
     }
 
     private function getRoles(): array
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
index 89a9ba9a9..c357cb138 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
@@ -36,7 +36,7 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
     public function validate($person, Constraint $constraint)
     {
         if (!$person instanceof Person) {
-            throw new UnexpectedTypeException($constraint, Person::class);
+            throw new UnexpectedTypeException($person, Person::class);
         }
 
         $participations = $person->getHouseholdParticipationsShareHousehold();
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index d3f6078ad..91aed0304 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -211,7 +211,7 @@ No requestor: Pas de demandeur
 No resources: "Pas d'interlocuteurs privilégiés"
 Persons associated: Usagers concernés
 Referrer: Référent
-Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.
+Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
 course.draft: Brouillon
@@ -557,7 +557,7 @@ household_composition:
     numberOfChildren: Nombre d'enfants mineurs au sein du ménage
     Household composition: Composition du ménage
     Composition added: Information sur la composition familiale ajoutée
-    Currently no composition: Aucune composition famiale renseignée.
+    Currently no composition: Aucune composition familiale renseignée.
     Add a composition: Ajouter une composition familiale
     Update composition: Modifier la composition familiale
 
diff --git a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
index 67be85edc..2d9e3abcb 100644
--- a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
@@ -17,8 +17,8 @@ use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Serializer\Annotation as Serializer;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * SingleTask.