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 b32f308f0..724aeef51 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -29,6 +29,7 @@
                v-bind:options="this.options"
                v-bind:default="this.default"
                v-bind:entity="this.entity"
+               v-bind:valid="this.valid"
                v-bind:flag="this.flag"
                ref="showAddress">
             </show-address>
@@ -54,6 +55,7 @@
          v-bind:options="this.options"
          v-bind:default="this.default"
          v-bind:entity="this.entity"
+         v-bind:valid="this.valid"
          v-bind:flag="this.flag"
          ref="showAddress"
          v-bind:insideModal="false" @openEditPane="openEditPane"
@@ -181,7 +183,7 @@ export default {
             },
          },
          valid: {
-            from: null,
+            from: new Date(),
             to: null
          },
          errorMsg: []
@@ -506,7 +508,7 @@ export default {
             addressId: this.entity.address.address_id,
             body: {
                validFrom: {
-                  datetime: `${this.$refs.showAddress.validFrom}T00:00:00+0100`
+                  datetime: this.valid.from.toISOString().split('T')[0]
                }
             },
             backUrl: this.context.backUrl
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
index 437a4d9d2..cfd137e51 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -100,6 +100,7 @@
 </template>
 
 <script>
+import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 
 export default {
    name: 'ShowAddress',
@@ -109,10 +110,11 @@ export default {
       'default',
       'flag',
       'entity',
+      'valid',
       'errorMsg',
       'insideModal'
    ],
-   emits: ['openEditPane', 'submitAddress', 'validFrom'],
+   emits: ['openEditPane', 'submitAddress'], //?
    computed: {
       address() {
          return this.entity.address;
@@ -129,8 +131,15 @@ export default {
       getSubmited() {
          return this.entity.address;
       },
-      validFrom() {
-         return new Date().toISOString().split('T')[0];
+      validFrom: {
+         set(value) {
+            this.valid.from = ISOToDate(value);
+
+            //new Date().toISOString().split('T')[0];
+         },
+         get() {
+            return dateToISO(this.valid.from);
+         }
       },
       getValidFromDateText() {
          return (this.context.entity.type === 'household') ? 'move_date' : 'validFrom';