diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index 9abf036cc..5a307aae9 100755
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -852,8 +852,8 @@ def set_admin_options(userdesc, perms, mlist, values):
     'forward_auto_discards'         : True,
     'hold_these_nonmembers'         : [],
     'host_name'                     : 'listes.polytechnique.org',
-    'include_list_post_header'      : False,
-    'include_rfc2369_headers'       : False,
+    'include_list_post_header'      : True,
+    'include_rfc2369_headers'       : True,
     'max_num_recipients'            : 0,
     'new_member_options'            : 256,
     'nondigestable'                 : True,
@@ -879,7 +879,7 @@ def check_options_runner(userdesc, perms, mlist, listname, correct):
     if mlist.real_name.lower() != listname:
         options['real_name'] = listname, mlist.real_name
         if correct: mlist.real_name = listname
-    return 1
+    return options
 
 
 def check_options(userdesc, perms, vhost, listname, correct=False):
diff --git a/modules/lists.php b/modules/lists.php
index a269d5a6c..fdb213ecc 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -985,8 +985,18 @@ function handler_check($page, $liste = null)
             S::assert_xsrf_token();
             $mlist->checkOptions(true);
         }
-
-        if (list($details, $options) = $mlist->checkOptions()) {
+        $diff = $mlist->checkOptions();
+        if (isset($diff)) {
+            $options = $diff;
+            #We will now expand internal arrays
+            foreach ($options as $key => $diff) {
+                if( is_array($diff) ) { #This should always be true
+                    $diff[0] = var_export($diff[0], true);
+                    $diff[1] = var_export($diff[1], true);
+                }
+                $options[$key] = $diff; #Overwrites original array
+            }
+            $details = $mlist->address;
             $page->assign_by_ref('details', $details);
             $page->assign_by_ref('options', $options);
         } else {
diff --git a/templates/lists/check.tpl b/templates/lists/check.tpl
index 73e158206..c177ac8b6 100644
--- a/templates/lists/check.tpl
+++ b/templates/lists/check.tpl
@@ -25,7 +25,7 @@
 
 {if $options|@count}
 <table class='bicol' cellpadding='2' cellspacing='0'>
-  <tr><th colspan='3'>Options incorrectes pour {$details.addr}</th></tr>
+  <tr><th colspan='3'>Options incorrectes pour {$details}</th></tr>
   <tr><th>champs</th><th>devrait être&nbsp;:</th><th>est&hellip;</th></tr>
   {foreach from=$options key=k item=o}
   <tr>