diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 5425897ab..5b3197725 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -255,6 +255,7 @@
     "BACKGROUND_GEOLOCATION_NOTIFICATION_TEXT": "Enabled",
     "NEW_NOTIFICATION": "New notification",
     "CLOSE": "Close",
+    "OPTIONAL": "Optional",
     "ORDER_NEW": "Waiting",
     "ORDER_NEW_HELP": "The restaurant has to confirm your order",
     "ORDER_ACCEPTED": "Accepted",
@@ -288,10 +289,17 @@
     "TASK_ADD_PROOF_OF_DELIVERY": "Add a proof of delivery",
     "STORE_NEW_DELIVERY": "New delivery",
     "STORE_NEW_DELIVERY_ADDRESS": "Address",
+    "STORE_NEW_DELIVERY_SEARCH_CLIENT": "Search for a client",
+    "STORE_NEW_DELIVERY_ENTER_SEARCH_CLIENT": "Enter a client name",
     "STORE_NEW_DELIVERY_ADDRESS_HELP": "Enter dropoff address to verify feasibility",
     "STORE_NEW_DELIVERY_PHONE_NUMBER": "Phone number",
+    "STORE_NEW_DELIVERY_ENTER_PHONE_NUMBER": "Enter a valid phone number",
+    "STORE_NEW_DELIVERY_BUSINESS_NAME": "Business name",
+    "STORE_NEW_DELIVERY_ENTER_BUSINESS_NAME": "Enter a business name",
     "STORE_NEW_DELIVERY_CONTACT_NAME": "Contact name",
+    "STORE_NEW_DELIVERY_ENTER_CONTACT_NAME": "Enter a contact name",
     "STORE_NEW_DELIVERY_COMMENTS": "Access information",
+    "STORE_NEW_DELIVERY_ENTER_COMMENTS": "Induce any useful information (intercom...)",
     "STORE_NEW_DELIVERY_DROPOFF_BEFORE": "Dropoff before",
     "STORE_NEW_DELIVERY_TIME_SLOT": "Time slot",
     "STORE_NEW_DELIVERY_SELECT_TIME_SLOT": "Select a time slot",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index a2277b140..2857a12f3 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -249,6 +249,7 @@
     "BACKGROUND_GEOLOCATION_NOTIFICATION_TEXT": "Activée",
     "NEW_NOTIFICATION": "Nouvelle notification",
     "CLOSE": "Fermer",
+    "OPTIONAL": "Optionnel",
     "ORDER_NEW": "En attente",
     "ORDER_NEW_HELP": "Le restaurateur doit valider votre commande",
     "ORDER_ACCEPTED": "Acceptée",
@@ -275,10 +276,18 @@
     "TASK_ADD_PROOF_OF_DELIVERY": "Ajouter une preuve de livraison",
     "STORE_NEW_DELIVERY": "Nouvelle livraison",
     "STORE_NEW_DELIVERY_ADDRESS": "Adresse",
+    "STORE_NEW_DELIVERY_SEARCH_CLIENT": "Rechercher un client",
+    "STORE_NEW_DELIVERY_ENTER_SEARCH_CLIENT": "Entrez le nom du client",
+
     "STORE_NEW_DELIVERY_ADDRESS_HELP": "Entrez l'adresse de dépôt pour vérifier la faisabilité",
     "STORE_NEW_DELIVERY_PHONE_NUMBER": "Numéro de téléphone",
-    "STORE_NEW_DELIVERY_CONTACT_NAME": "Nom de la personne à contacter",
+    "STORE_NEW_DELIVERY_ENTER_PHONE_NUMBER": "Entrez un numéro de téléphone valide",
+    "STORE_NEW_DELIVERY_BUSINESS_NAME": "Nom de l'entreprise",
+    "STORE_NEW_DELIVERY_ENTER_BUSINESS_NAME": "Entrez le nom de l'entreprise",
+    "STORE_NEW_DELIVERY_CONTACT_NAME": "Contact",
+    "STORE_NEW_DELIVERY_ENTER_CONTACT_NAME": "Entrez le nom de la personne à contacter",
     "STORE_NEW_DELIVERY_COMMENTS": "Informations d'accès",
+    "STORE_NEW_DELIVERY_ENTER_COMMENTS": "Indiquez toute information utile (interphone…)",
     "STORE_NEW_DELIVERY_DROPOFF_BEFORE": "À déposer avant",
     "STORE_NEW_DELIVERY_TIME_SLOT": "Tranche horaire",
     "STORE_NEW_DELIVERY_SELECT_TIME_SLOT": "Choisissez une tranche horaire",
diff --git a/src/navigation/store/ClientListInput.js b/src/navigation/store/ClientListInput.js
new file mode 100644
index 000000000..db20ab688
--- /dev/null
+++ b/src/navigation/store/ClientListInput.js
@@ -0,0 +1,145 @@
+import { Text } from 'native-base';
+import { useState } from 'react';
+import AutocompleteInput from 'react-native-autocomplete-input';
+import { TouchableOpacity } from 'react-native-gesture-handler';
+import ItemSeparator from '../../components/ItemSeparator';
+import {
+  useBackgroundColor,
+  useBackgroundContainerColor,
+  useBackgroundHighlightColor,
+  usePrimaryColor,
+} from '../../styles/theme';
+import FormInput from './components/FormInput';
+
+// const shadowStyle = {
+//   shadowColor: '#000',
+//   shadowOffset: {
+//     width: 0,
+//     height: 6,
+//   },
+//   shadowOpacity: 10.39,
+//   shadowRadius: 8.3,
+
+//   elevation: 13,
+// };
+
+export default function ClientListInput({
+  addresses,
+  onSelectAddress,
+  placeholder,
+}) {
+  const [hideSuggestions, setHideSuggestions] = useState(true);
+  const [value, setValue] = useState('');
+  const backgroundContainerColor = useBackgroundContainerColor();
+  const backgroundHighlightColor = useBackgroundHighlightColor();
+  const backgroundColor = useBackgroundColor();
+  // const shadowColor = useColorModeValue('rgba(0,0,0,.39)', 'rgba(0,0,0,1)');
+  const primaryColor = usePrimaryColor();
+
+  function handleFocus() {
+    setHideSuggestions(false);
+  }
+
+  function handleBlur() {
+    setHideSuggestions(true);
+  }
+
+  function handleChangeText(text) {
+    if (hideSuggestions) setHideSuggestions(false);
+    setValue(text);
+  }
+
+  function RenderedInput() {
+    return (
+      <FormInput
+        autoCorrect={false}
+        returnKeyType="done"
+        onBlur={handleBlur}
+        onFocus={handleFocus}
+        value={value}
+        onChangeText={handleChangeText}
+        placeholder={placeholder}
+      />
+    );
+  }
+
+  function selectAddress(address) {
+    onSelectAddress(address);
+    setHideSuggestions(true);
+    setValue('');
+  }
+
+  return (
+    <>
+      <AutocompleteInput
+        hideResults={hideSuggestions}
+        data={
+          value
+            ? addresses.filter(({ name, contactName, streetAddress }) =>
+                [name, contactName, streetAddress].some(field =>
+                  field.toLowerCase().includes(value.toLowerCase()),
+                ),
+              )
+            : addresses
+        }
+        renderTextInput={RenderedInput}
+        onChangeText={handleChangeText}
+        inputContainerStyle={{
+          margin: 0,
+          padding: 0,
+          borderWidth: 0,
+          borderRadius: 4,
+        }}
+        flatListProps={{
+          style: {
+            borderWidth: 1,
+            borderTopWidth: 1,
+            borderColor: primaryColor,
+            borderRadius: 4,
+            marginTop: -1,
+            backgroundColor: backgroundContainerColor,
+            // overflow: 'visible',
+
+            // ...{ ...shadowStyle, shadowColor },
+          },
+          keyboardShouldPersistTaps: 'always',
+          keyExtractor: (item, i) => `prediction-${i}`,
+          renderItem: item => (
+            <TouchableOpacity
+              onPress={() => selectAddress(item.item)}
+              style={{
+                padding: 12,
+              }}>
+              <Text
+                style={{
+                  fontSize: 14,
+                  flex: 1,
+                  margin: 0,
+                  padding: 0,
+                  borderWidth: 0,
+                }}
+                numberOfLines={1}
+                ellipsizeMode="tail">
+                {`${item.item.name} - ${item.item.contactName}`}
+              </Text>
+              <Text
+                style={{
+                  fontSize: 14,
+                  flex: 1,
+                  margin: 0,
+                  padding: 0,
+                  borderWidth: 0,
+                }}
+                numberOfLines={1}
+                ellipsizeMode="tail">
+                {`${item.item.streetAddress}`}
+              </Text>
+            </TouchableOpacity>
+          ),
+          ItemSeparatorComponent: ItemSeparator,
+        }}
+        style={{}}
+      />
+    </>
+  );
+}
diff --git a/src/navigation/store/ModalFormWrapper.js b/src/navigation/store/ModalFormWrapper.js
index efe69ab87..c3b04a160 100644
--- a/src/navigation/store/ModalFormWrapper.js
+++ b/src/navigation/store/ModalFormWrapper.js
@@ -1,4 +1,4 @@
-import { Box, Button, VStack } from 'native-base';
+import { Box, Button, ScrollView, VStack } from 'native-base';
 import { SafeAreaView } from 'react-native';
 import { useBackgroundContainerColor } from '../../styles/theme';
 
@@ -22,9 +22,11 @@ export default function ModalFormWrapper({
         style={{
           backgroundColor,
         }}>
-        <Box p="5" gap="3">
-          {children}
-        </Box>
+        <ScrollView>
+          <Box p="5" gap="3">
+            {children}
+          </Box>
+        </ScrollView>
         <Box p="5">
           <Button onPress={handleSubmit}>
             {isSubmit ? t('SUBMIT') : t('NEXT')}
diff --git a/src/navigation/store/NewDeliveryAddress.js b/src/navigation/store/NewDeliveryAddress.js
index 043610ab0..2c6af30a8 100644
--- a/src/navigation/store/NewDeliveryAddress.js
+++ b/src/navigation/store/NewDeliveryAddress.js
@@ -14,6 +14,7 @@ import {
   useBackgroundHighlightColor,
   usePrimaryColor,
 } from '../../styles/theme';
+import ClientListInput from './ClientListInput';
 import ModalFormWrapper from './ModalFormWrapper';
 import FormInput from './components/FormInput';
 
@@ -29,21 +30,25 @@ function NewDelivery(props) {
     borderColor: backgroundHighlightColor,
   };
 
+  function setAddressData(data, setFieldValue) {
+    const contactName = data.contactName || '';
+    const telephone = data.telephone || '';
+    const businessName = data.businessName || '';
+    const comment = data.comment || '';
+
+    setFieldValue('contactName', contactName);
+    setFieldValue('telephone', telephone);
+    setFieldValue('businessName', businessName);
+    setFieldValue('comments', comment);
+    setAddress({
+      streetAddress: data.streetAddress,
+      geo: data.geo,
+    });
+  }
+
   function onSelectAddress(address, setFieldValue) {
     if (address['@id']) {
-      const contactName = address.contactName || '';
-      const telephone = address.telephone || '';
-      const businessName = address.businessName || '';
-      const comment = address.comment || '';
-
-      setFieldValue('contactName', contactName);
-      setFieldValue('telephone', telephone);
-      setFieldValue('businessName', businessName);
-      setFieldValue('description', comment);
-      setAddress({
-        streetAddress: address.streetAddress,
-        geo: address.geo,
-      });
+      setAddressData(address, setFieldValue);
     } else {
       setAddress(address);
     }
@@ -117,7 +122,7 @@ function NewDelivery(props) {
     telephone: '',
     contactName: '',
     businessName: '',
-    description: '',
+    comments: '',
   };
 
   function handleChangeTelephone(value, setFieldValue, setFieldTouched) {
@@ -132,7 +137,7 @@ function NewDelivery(props) {
         props.country,
       ).format('E.164'),
       contactName: values.contactName,
-      description: values.description,
+      comments: values.comments,
       businessName: values.businessName,
       address,
     };
@@ -145,8 +150,8 @@ function NewDelivery(props) {
       initialValues={initialValues}
       validate={validate}
       onSubmit={values => submit(values)}
-      validateOnBlur={false}
-      validateOnChange={false}>
+      validateOnBlur={true}
+      validateOnChange={true}>
       {({
         handleChange,
         handleBlur,
@@ -158,6 +163,20 @@ function NewDelivery(props) {
         setFieldTouched,
       }) => (
         <ModalFormWrapper handleSubmit={handleSubmit} t={props.t}>
+          <View style={[styles.formGroup, { zIndex: 2 }]}>
+            <Text style={styles.label}>
+              {props.t('STORE_NEW_DELIVERY_SEARCH_CLIENT')}{' '}
+              <Text style={styles.optional}>({props.t('OPTIONAL')})</Text>
+            </Text>
+            <ClientListInput
+              onSelectAddress={a => {
+                setAddressData(a, setFieldValue);
+                setValidAddresses(true);
+              }}
+              addresses={props.addresses}
+              placeholder={props.t('STORE_NEW_DELIVERY_ENTER_SEARCH_CLIENT')}
+            />
+          </View>
           <View style={[styles.formGroup, { zIndex: 1 }]}>
             <Text style={styles.label}>
               {props.t('STORE_NEW_DELIVERY_ADDRESS')}
@@ -165,8 +184,13 @@ function NewDelivery(props) {
             </Text>
             <View style={styles.autocompleteContainer}>
               <AddressAutocomplete
-                key={address}
+                key={address?.streetAddress ?? ''}
                 addresses={props.addresses}
+                onChangeText={() => {
+                  if (validAddresses) setValidAddresses(false);
+                  handleChange('address');
+                }}
+                onBlur={handleBlur('address')}
                 value={address}
                 onSelectAddress={e => onSelectAddress(e, setFieldValue)}
                 containerStyle={[
@@ -187,20 +211,24 @@ function NewDelivery(props) {
                 _focus={{ borderColor: primaryColor }}
               />
             </View>
-            {errors.address && touched.address && (
+            {errors.address && (
               <Text note style={styles.errorText}>
                 {errors.address}
               </Text>
             )}
           </View>
           <View style={[styles.formGroup]}>
-            <Text style={styles.label}>{'Business Name'}</Text>
+            <Text style={styles.label}>
+              {props.t('STORE_NEW_DELIVERY_BUSINESS_NAME')}{' '}
+              <Text style={styles.optional}>({props.t('OPTIONAL')})</Text>
+            </Text>
             <FormInput
               autoCorrect={false}
               returnKeyType="done"
               onChangeText={handleChange('businessName')}
               onBlur={handleBlur('businessName')}
               value={values.businessName}
+              placeholder={props.t('STORE_NEW_DELIVERY_ENTER_BUSINESS_NAME')}
             />
             {errors.businessName && touched.businessName && (
               <Text note style={styles.errorText}>
@@ -218,6 +246,7 @@ function NewDelivery(props) {
               onChangeText={handleChange('contactName')}
               onBlur={handleBlur('contactName')}
               value={values.contactName}
+              placeholder={props.t('STORE_NEW_DELIVERY_ENTER_CONTACT_NAME')}
             />
             {errors.contactName && touched.contactName && (
               <Text note style={styles.errorText}>
@@ -238,6 +267,7 @@ function NewDelivery(props) {
               }
               onBlur={handleBlur('telephone')}
               value={values.telephone}
+              placeholder={props.t('STORE_NEW_DELIVERY_ENTER_PHONE_NUMBER')}
             />
             {errors.telephone && touched.telephone && (
               <Text note style={styles.errorText}>
@@ -247,7 +277,8 @@ function NewDelivery(props) {
           </View>
           <View style={[styles.formGroup]}>
             <Text style={styles.label}>
-              {props.t('STORE_NEW_DELIVERY_COMMENTS')}
+              {props.t('STORE_NEW_DELIVERY_COMMENTS')}{' '}
+              <Text style={styles.optional}>({props.t('OPTIONAL')})</Text>
             </Text>
             <FormInput
               style={{
@@ -255,9 +286,10 @@ function NewDelivery(props) {
               }}
               autoCorrect={false}
               multiline={true}
-              onChangeText={handleChange('description')}
-              onBlur={handleBlur('description')}
-              value={values.description}
+              onChangeText={handleChange('comments')}
+              onBlur={handleBlur('comments')}
+              value={values.comments}
+              placeholder={props.t('STORE_NEW_DELIVERY_ENTER_COMMENTS')}
             />
           </View>
         </ModalFormWrapper>
@@ -290,6 +322,11 @@ const styles = StyleSheet.create({
     marginBottom: 8,
     fontWeight: '600',
   },
+  optional: {
+    fontWeight: '400',
+    opacity: 0.7,
+    fontSize: 12,
+  },
   help: {
     marginBottom: 5,
     fontWeight: '400',