diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 8e96a1595..a87ad4814 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -40,6 +40,7 @@
           :key="uniqid"
           :buttonTitle="translatedListOfTypes"
           :modalTitle="translatedListOfTypes"
+          :allowCreate="true"
           @addNewPersons="addNewEntity"
         >
         </add-persons>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 11b851536..35a674033 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -32,11 +32,13 @@ interface AddPersonsConfig {
   buttonTitle: string;
   modalTitle: string;
   options: SearchOptions;
+  allowCreate?: boolean;
 }
 
 const props = withDefaults(defineProps<AddPersonsConfig>(), {
   suggested: () => [],
   selected: () => [],
+  allowCreate: () => true,
 });
 
 const emit = defineEmits<{
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
index 7d4f7216b..4c0021fc9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
@@ -63,7 +63,15 @@
             @update-selected="updateSelected"
           />
 
-          <div class="create-button">
+          <div v-if="props.allowCreate && query.length > 0" class="create-button">
+            <button
+              type="button"
+              @click="emit('onAskForCreate', {query })"
+            >
+              {{ trans(ONTHEFLY_CREATE_BUTTON, { q: query }) }}
+            </button>
+            <!--
+            TODO remove this
             <on-the-fly
               v-if="
                 queryLength >= 3 &&
@@ -128,12 +136,14 @@ interface Props {
   suggested?: Suggestion[];
   selected?: Suggestion[];
   modalDialogClass?: string;
+  allowCreate?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
   suggested: () => [],
   selected: () => [],
   modalDialogClass: 'modal-dialog-scrollable modal-xl',
+  allowCreate: () => true,
 });
 
 const emit = defineEmits<{