diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 877b97244..edfd53f71 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -109,7 +109,19 @@ export default {
          .filter((e) => e !== null)
          .filter((e) => e.type === 'person')
          .filter(
-            (p) => !state.accompanyingCourse.participations.map((pa) => pa.person.id).includes(p.id)
+            (p) => return !state.accompanyingCourse.participations.filter(pa => pa.endDate === null).map((pa) => pa.person.id).includes(p.id)
+         )
+         // filter persons appearing twice in requestor and resources
+         .filter(
+             (e, index, suggested) => {
+               for (let i = 0; i < suggested.length; i = i+1) {
+                 if (i < index && e.id === suggested[i].id) {
+                   return false
+                 }
+               }
+
+               return true;
+             }
          )
       }),
       ...mapGetters([
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index b8bab08c6..06d0ba106 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -32,7 +32,7 @@
             </third-party-render-box>
          </template>
       </confidential>
-      
+
       <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
          <template v-slot:confidential-content>
             <person-render-box render="bloc"
@@ -190,11 +190,23 @@ export default {
    },
    computed: {
       ...mapState({
-         suggestedEntities: state => [
-            ...state.accompanyingCourse.participations.map(p => p.person),
-            ...state.accompanyingCourse.resources.map(r => r.resource)
-         ]
-         .filter((e) => e !== null)
+         suggestedEntities: state => {
+           return [
+               ...state.accompanyingCourse.participations.map(p => p.person),
+               ...state.accompanyingCourse.resources.map(r => r.resource)
+             ]
+               .filter((e) => e !== null)
+               // filter for same entity appearing twice
+               .filter((e, index, suggested) => {
+                 for (let i = 0; i < suggested.length; i = i+1) {
+                   if (i < index && e.id === suggested[i].id && e.type === suggested[i].type) {
+                     return false
+                   }
+                 }
+
+                 return true;
+           })
+         }
       }),
       accompanyingCourse() {
          return this.$store.state.accompanyingCourse
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 8769c47fc..70f4e75ae 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -89,6 +89,18 @@ export default {
                }
             }
          )
+          // filter persons appearing twice in requestor and resources
+          .filter(
+              (e, index, suggested) => {
+                for (let i = 0; i < suggested.length; i = i+1) {
+                  if (i < index && e.id === suggested[i].id) {
+                    return false
+                  }
+                }
+
+                return true;
+              }
+          )
    }),
    methods: {
       removeResource(item) {