diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 530a14e95..f5fe283be 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -35,7 +35,7 @@
                     </time>
 
                     <time v-else-if="person.birthdate && person.deathdate" :datetime="person.deathdate" :title="person.deathdate">
-                        {{ birthdate }} - {{ deathdate }}
+                        {{ $d(birthdate) }} - {{ $d(deathdate) }}
                     </time>
 
                     <time v-else-if="person.deathdate" :datetime="person.deathdate" :title="person.deathdate">
@@ -163,22 +163,15 @@ export default {
             return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : 'person.gender.neuter';
         },
         birthdate: function(){
-            if(this.person.birthdate !== null){
-            const date = new Date(this.person.birthdate.datetime);
-            return dateToISO(date)
+            if(this.person.birthdate !== null || this.person.birthdate === "undefined"){
+            return new Date(this.person.birthdate.datetime);
             } else {
                 return "";
             }
         },
         deathdate: function(){
-           // TODO FIX edition conflict:  if null or undefined ?
-           // if (typeof this.person.deathdate !== 'undefined') {
-           //   var date = new Date(this.person.deathdate.datetime);
-           //   return dateToISO(date);
-           //}
-            if(this.person.deathdate !== null){
-               const date = new Date(this.person.deathdate.datetime);
-               return date.toLocaleDateString("fr-FR");
+            if(this.person.deathdate !== null || this.person.birthdate === "undefined"){
+               return new Date(this.person.deathdate.datetime);
             } else {
                 return "";
             }