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/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