diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/person.js b/src/Bundle/ChillPersonBundle/Resources/public/js/person.js
index 6ebd8d7cc..da40dddc7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/js/person.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/js/person.js
@@ -1,10 +1,29 @@
 import { ShowHide } from 'ShowHide/show_hide.js';
 
+const maritalStatus = document.getElementById("maritalStatus");
+const maritalStatusDate = document.getElementById("maritalStatusDate");
 const personEmail = document.getElementById("personEmail");
 const personAcceptEmail = document.getElementById("personAcceptEmail");
 const personPhoneNumber = document.getElementById("personPhoneNumber");
 const personAcceptSMS = document.getElementById("personAcceptSMS");
 
+
+new ShowHide({
+    froms: [maritalStatus],
+    container: [maritalStatusDate],
+    test: function(froms) {
+        for (let f of froms.values()) {
+            for (let input of f.querySelectorAll('select').values()) {
+                if (input.value) {
+                    return true
+                }
+            }
+        }
+        return false;
+    },
+    event_name: 'change'
+});
+
 new ShowHide({
     froms: [personEmail],
     container: [personAcceptEmail],
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index 95b4e6f62..549025429 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -60,7 +60,7 @@
     {%- endif -%}
 </fieldset>
 
-{%- if form.nationality is defined or form.spokenLanguages is defined or form.maritalStatus is defined -%}
+{%- if form.nationality is defined or form.spokenLanguages is defined -%}
 <fieldset>
     <legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
     {%- if form.nationality is defined -%}
@@ -69,11 +69,21 @@
     {%- if form.spokenLanguages is defined -%}
     {{ form_row(form.spokenLanguages, {'label' : 'Spoken languages'}) }}
     {%- endif -%}
+</fieldset>
+{%- endif -%}
+
+{%- if form.numberOfChildren is defined or form.maritalStatus is defined -%}
+<fieldset>
+    <legend><h2>{{ 'Marital status'|trans }}</h2></legend>
     {{ form_row(form.numberOfChildren, {'label' : 'Number of children'}) }}
     {%- if form.maritalStatus is defined -%}
-    {{ form_row(form.maritalStatus, { 'label' : 'Marital status'} ) }}
-    {{ form_row(form.maritalStatusDate, { 'label' : 'Date of last marital status change'} ) }}
-    {{ form_row(form.maritalStatusComment, { 'label' : 'Comment on the marital status'} ) }}
+    <div id="maritalStatus">
+        {{ form_row(form.maritalStatus, { 'label' : 'Marital status'} ) }}
+    </div>
+    <div id="maritalStatusDate">
+        {{ form_row(form.maritalStatusDate, { 'label' : 'Date of last marital status change'} ) }}
+        {{ form_row(form.maritalStatusComment, { 'label' : 'Comment on the marital status'} ) }}
+    </div>
     {%- endif -%}
 </fieldset>
 {%- endif -%}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index 6176864a0..76c6437d5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -185,12 +185,16 @@ This view should receive those arguments:
                         <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                     {% endif %}
                 </dd>
+            </dl>
+            <dl>
                 <dt>{{'Date of last marital status change'|trans}}&nbsp;:</dt>
                 {% if person.maritalStatusDate is not null %}
                 <dd>
                     {{ person.maritalStatusDate|format_date('long') }}
                 </dd>
                 {% endif %}
+            </dl>
+            <dl>
                 {% if not person.maritalStatusComment.isEmpty %}
                 <dt>{{'Comment on the marital status'|trans}}&nbsp;:</dt>
                 <dd>