diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index f6dcd9371..47958031c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -104,7 +104,11 @@
             <button class="btn btn-cancel change-icon" @click="resetPane">
                {{ $t('action.cancel') }}
             </button>
-            <button class="btn btn-save" @click="closeEditPane">
+            <button v-if="useDatePane" class="btn btn-misc" @click="closeEditPane">
+               {{ $t('nav.next')}}
+               <i class="fa fa-fw fa-arrow-right"></i>
+            </button>
+            <button v-else class="btn btn-save" @click="closeEditPane">
                {{ $t('action.save')}}
             </button>
          </template>
@@ -128,7 +132,13 @@
             </a>
          </template>
          <template v-slot:action>
-            <li>
+            <li v-if="useDatePane">
+               <button class="btn btn-misc" @click="closeEditPane">
+                  {{ $t('nav.next')}}
+                  <i class="fa fa-fw fa-arrow-right"></i>
+               </button>
+            </li>
+            <li v-else>
                <button class="btn btn-save" @click="closeEditPane">
                   {{ $t('action.save')}}
                </button>
@@ -189,7 +199,7 @@
 
          <template v-slot:action>
             <li>
-               <button class="btn btn-update" @click="openEditPane">
+               <button class="btn btn-update" @click="closeDatePane">
                   {{ $t('action.edit')}}
                </button>
             </li>
@@ -323,7 +333,7 @@ export default {
       //console.log('options bindModal.step2', this.options.bindModal.step2);
       //console.log('options useDate.validFrom', this.options.useDate.validFrom);
       //console.log('options useDate.validTo', this.options.useDate.validTo);
-      //console.log('useDatePane', this.useDatePane);
+      console.log('useDatePane', this.useDatePane);
 
       console.log('Mounted now !');
       if (this.context.edit) {