diff --git a/src/_includes/partials/components/contact-form.njk b/src/_includes/partials/components/contact-form.njk
index faf90ef..aee53c1 100644
--- a/src/_includes/partials/components/contact-form.njk
+++ b/src/_includes/partials/components/contact-form.njk
@@ -1,9 +1,13 @@
-{% from "macros/form.njk" import label, field, select, option, textarea, checkboxes, button %}
+{% from "macros/form.njk" import label, field, select, option, textarea, checkboxes, button, hidden_field %}
 
 <section class="[ form-container ]">
-  <svg aria-hidden="true" viewBox="0 0 1440 131" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M0 0h1440v131H0z"/><path d="M0 4.643l40-2.326c40-2.5 120-6.888 200 11.67 80 18.735 160 60.854 240 74.894 80 14.04 160 0 240-16.365 80-16.54 160-34.968 240-28.08 80 7.152 160 39.619 240 39.75 80-.131 160-32.598 200-49.139l40-16.365V131H0V4.643z" fill="#D6F253"/></svg>
+  {% if not contactMember %}
+    <svg aria-hidden="true" viewBox="0 0 1440 131" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M0 0h1440v131H0z"/><path d="M0 4.643l40-2.326c40-2.5 120-6.888 200 11.67 80 18.735 160 60.854 240 74.894 80 14.04 160 0 240-16.365 80-16.54 160-34.968 240-28.08 80 7.152 160 39.619 240 39.75 80-.131 160-32.598 200-49.139l40-16.365V131H0V4.643z" fill="#D6F253"/></svg>
+  {% endif %}
   <div class="[ inner-wrapper ]">
-    <h2 id="contact-form" class="[ contact-heading ]">Nous contacter</h2>
+    {% if not contactMember %}
+      <h2 id="contact-form" class="[ contact-heading ]">Nous contacter</h2>
+    {% endif %}
     <form name="contact" method="POST" action="/form/contact-form-handler.php">
       <ol class="[ field-list ]">
         <li class="[ field-list__field-group ]">
@@ -16,20 +20,31 @@
         </li>
         <li class="[ field-list__field-group ] [ full-width ]">
           {{ label("Je vous contacte pour :", "select") }}
-          {{ select( "select", [ 
-            {label: "Obtenir un rendez-vous (décrivez votre projet en quelques lignes)", value: "option 1"},
-            {label: "Obtenir des précisions sur le statut d’entrepreneur salarié", value: "option 2"},
-            {label: "Proposer une mission à un coopérateur", value: "option 3"},
-            {label: "Proposer un partenariat", value: "option 4"}
-          ], { required: true, options_before: [""], options_after: ["Autre demande"] } ) }}
+          {% if contactMember %}
+            {{ select( "select", [ 
+              {label: "Obtenir un rendez-vous (décrivez votre projet en quelques lignes)", value: "option 1"},
+              {label: "Proposer une mission à un coopérateur", value: "option 3"}
+            ], { required: true, options_before: [""], options_after: ["Autre demande"] } ) }}
+          {% else %}
+            {{ select( "select", [ 
+              {label: "Obtenir un rendez-vous (décrivez votre projet en quelques lignes)", value: "option 1"},
+              {label: "Obtenir des précisions sur le statut d’entrepreneur salarié", value: "option 2"},
+              {label: "Proposer une mission à un coopérateur", value: "option 3"},
+              {label: "Proposer un partenariat", value: "option 4"}
+            ], { required: true, options_before: [""], options_after: ["Autre demande"] } ) }}
+          {% endif %}
         </li>
         <li class="[ field-list__field-group ] [ full-width ]">
           {{ label("Votre message", "message") }}
           {{ textarea( "message", { required: true, autocapitalize: "sentences", spellcheck: "true" } ) }}
         </li>
-        <li class="[ field-list__field-group ] [ full-width ]">
-          {{ checkboxes("", "subscribe", [ "Je souhaite être tenu au courant de l’actualité Astrolabe"], { description: "" } ) }}
-        </li>
+        {% if contactMember %}
+          {{ hidden_field('subscribe', '') }}
+        {% else %}
+          <li class="[ field-list__field-group ] [ full-width ]">
+            {{ checkboxes("", "subscribe", [ "Je souhaite être tenu au courant de l’actualité Astrolabe"], { description: "" } ) }}
+          </li>
+        {% endif %}
         <!-- H o n e y p o t -->
         <li aria-hidden="true">
           <label class="ohnohoney" for="name"></label>
@@ -40,6 +55,9 @@
           <input tabindex="-1" class="ohnohoney" autocomplete="off" type="email" id="email" name="email" placeholder="Your e-mail here">
         </li>
       </ol>
+      {% if contactMember %}
+        {{ hidden_field('contactTo', contactMember) }}
+      {% endif %}
       {{ button("Envoyer") }}
     </form>
   </div>
diff --git a/src/form/contact-form-handler.php b/src/form/contact-form-handler.php
index 7fffbb1..3fbbd3e 100644
--- a/src/form/contact-form-handler.php
+++ b/src/form/contact-form-handler.php
@@ -15,13 +15,11 @@ $domainFromMyEmail = (
 : $myEmailSplitted[1];
 
 $wantedContact = filter_input(INPUT_POST, 'contactTo', FILTER_VALIDATE_EMAIL);
-if (
+$wantedContact = (
     empty($wantedContact)
     || empty($domainFromMyEmail)
     || substr($wantedContact, -strlen($domainFromMyEmail)) != $domainFromMyEmail
-) {
-    $wantedContact = $myEmail;
-}
+) ? $myEmail : "$wantedContact@$domainFromMyEmail" ;
 
 if(empty($_POST['namezzz']) || empty($_POST['emailzzz']) || empty($_POST['message'])) {
     $errors .= "\n Error: all fields are required";