diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
index 2e80572b7..3b055da79 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
@@ -6,7 +6,7 @@
 const fetchCountries = () => {
    console.log('<<< fetching countries');
 
-   const url = `/api/1.0/main/country.json`;
+   const url = `/api/1.0/main/country.json?item_per_page=1000`;
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
@@ -21,6 +21,7 @@ const fetchCountries = () => {
 const fetchCities = (country) => {
    console.log('<<< fetching cities for', country);
    //TODO use country
+   //TODO deal with huge number of postal code ... we should do suggestion...
    const url = `/api/1.0/main/postal-code.json`;
    return fetch(url)
       .then(response => {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
index 0ca2c0b87..7d5e039e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
@@ -21,7 +21,12 @@ export default {
    props: ['address', 'getCities'],
    computed: {
       countries() {
-         return this.address.loaded.countries; // TODO place Belgium and France first
+         const countries = this.address.loaded.countries;
+         let orderedCountries = [];
+         orderedCountries.push(...countries.filter(c => c.countryCode === 'FR'))
+         orderedCountries.push(...countries.filter(c => c.countryCode === 'BE'))
+         orderedCountries.push(...countries.filter(c => c.countryCode !== 'FR').filter(c => c.countryCode !== 'BE'))
+         return orderedCountries;
       },
       selected: {
          set(value) {