diff --git a/htdocs/adherents/admin/mailman.php b/htdocs/adherents/admin/mailman.php
index 29b2099ccfc..9e0b859db67 100644
--- a/htdocs/adherents/admin/mailman.php
+++ b/htdocs/adherents/admin/mailman.php
@@ -51,14 +51,17 @@ $testunsubscribeemail = GETPOST("testunsubscribeemail");
 // Action mise a jour ou ajout d'une constante
 if ($action == 'update' || $action == 'add')
 {
-	$constname=GETPOST("constname");
-	$constvalue=GETPOST("constvalue");
-	$consttype=GETPOST("consttype");
-	$constnote=GETPOST("constnote");
-	$res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity);
-
-	if (! $res > 0) $error++;
-
+	foreach($_POST['constname'] as $key => $val)
+	{
+		$constname=$_POST["constname"][$key];
+		$constvalue=$_POST["constvalue"][$key];
+		$consttype=$_POST["consttype"][$key];
+		$constnote=$_POST["constnote"][$key];
+		$res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity);
+	
+		if (! $res > 0) $error++;
+	}
+	
 	if (! $error)
 	{
 		$mesg = '<div class="ok">'.$langs->trans("SetupSaved").'</div>';
@@ -159,9 +162,6 @@ dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 dol_htmloutput_mesg($mesg);
 
 
-/*
- * Mailman
- */
 $var=!$var;
 if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 {
@@ -180,6 +180,8 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 
     print_fiche_titre($langs->trans('MailmanTitle'), $lien,'');
 
+    print '<br>';
+    
     // JQuery activity
     print '<script type="text/javascript">
     var i1=0;
@@ -196,7 +198,7 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
     });
     </script>';
 
-    form_constantes($constantes);
+    form_constantes($constantes,1);
 
     print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
     print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL% <br>';
@@ -217,12 +219,12 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
     print '<form action="'.$_SERVER["PHP_SELF"].'">';
     print '<input type="hidden" name="action" value="testsubscribe">';
     print $langs->trans("TestSubscribe").'<br>';
-    print $langs->trans("EMail").' <input type="email" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+    print $langs->trans("EMail").' <input type="email" class="flat" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
     print '</form>';
     print '<form action="'.$_SERVER["PHP_SELF"].'">';
     print '<input type="hidden" name="action" value="testunsubscribe">';
     print $langs->trans("TestUnSubscribe").'<br>';
-    print $langs->trans("EMail").' <input type="email" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+    print $langs->trans("EMail").' <input type="email" class="flat" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
     print '</form>';
 }
 
diff --git a/htdocs/adherents/admin/spip.php b/htdocs/adherents/admin/spip.php
index abc795bcce2..9bbb95c2697 100644
--- a/htdocs/adherents/admin/spip.php
+++ b/htdocs/adherents/admin/spip.php
@@ -139,6 +139,7 @@ if (! empty($conf->global->ADHERENT_USE_SPIP))
 	);
 
     print_fiche_titre($langs->trans('SPIPTitle'), $lien, '');
+	print '<br>';
     form_constantes($constantes);
     print '<br>';
 }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 0d4bbcf6d7a..434ffc7d7fb 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1001,20 +1001,22 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
  *	Show array with constants to edit
  *
  *	@param	array	$tableau		Array of constants
+ *	@param	int		$strictw3c		Respect W3C (no form into table)
  *	@return	void
  */
-function form_constantes($tableau)
+function form_constantes($tableau,$strictw3c=0)
 {
     global $db,$bc,$langs,$conf,$_Avery_Labels;
 
     $form = new Form($db);
 
+    if (! empty($strictw3c)) print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    	
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Description").'</td>';
     print '<td>'.$langs->trans("Value").'*</td>';
-    print '<td>&nbsp;</td>';
-    print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
+    if (empty($strictw3c)) print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
     print "</tr>\n";
     $var=true;
 
@@ -1044,17 +1046,17 @@ function form_constantes($tableau)
             	$obj = (object) array('rowid'=>'','name'=>'','value'=>'','type'=>'','note'=>'');
             }
 
-            print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+            if (empty($strictw3c)) print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 
             print "<tr ".$bc[$var].">";
 
-            // Affiche nom constante
+            // Show constant
             print '<td>';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="rowid" value="'.$obj->rowid.'">';
-            print '<input type="hidden" name="constname" value="'.$const.'">';
-            print '<input type="hidden" name="constnote" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
+            print '<input type="hidden" name="rowid'.(empty($strictw3c)?'':'[]').'" value="'.$obj->rowid.'">';
+            print '<input type="hidden" name="constname'.(empty($strictw3c)?'':'[]').'" value="'.$const.'">';
+            print '<input type="hidden" name="constnote'.(empty($strictw3c)?'':'[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
 
             print $langs->trans('Desc'.$const);
 
@@ -1077,6 +1079,7 @@ function form_constantes($tableau)
 
             print "</td>\n";
 
+            // Value
             if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE')
             {
                 print '<td>';
@@ -1087,55 +1090,57 @@ function form_constantes($tableau)
                 {
                     $arrayoflabels[$codecards]=$_Avery_Labels[$codecards]['name'];
                 }
-                print $form->selectarray('constvalue',$arrayoflabels,($obj->value?$obj->value:'CARD'),1,0,0);
-                print '</td><td>';
+                print $form->selectarray('constvalue'.(empty($strictw3c)?'':'[]'),$arrayoflabels,($obj->value?$obj->value:'CARD'),1,0,0);
                 print '<input type="hidden" name="consttype" value="yesno">';
                 print '</td>';
             }
             else
             {
                 print '<td>';
-                //print 'aa'.$const;
                 if (in_array($const,array('ADHERENT_CARD_TEXT','ADHERENT_CARD_TEXT_RIGHT','ADHERENT_ETIQUETTE_TEXT')))
                 {
-                    print '<textarea class="flat" name="constvalue" cols="50" rows="5" wrap="soft">'."\n";
+                    print '<textarea class="flat" name="constvalue'.(empty($strictw3c)?'':'[]').'" cols="50" rows="5" wrap="soft">'."\n";
                     print $obj->value;
                     print "</textarea>\n";
-                    print '</td><td>';
                     print '<input type="hidden" name="consttype" value="texte">';
                 }
                 else if (in_array($const,array('ADHERENT_AUTOREGISTER_NOTIF_MAIL','ADHERENT_AUTOREGISTER_MAIL','ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL')))
                 {
                     require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                    $doleditor=new DolEditor('constvalue_'.$const,$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
+                    $doleditor=new DolEditor('constvalue_'.$const.(empty($strictw3c)?'':'[]'),$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
                     $doleditor->Create();
-
-                    print '</td><td>';
-                    print '<input type="hidden" name="consttype" value="texte">';
+                    print '<input type="hidden" name="consttype'.(empty($strictw3c)?'':'[]').'" value="texte">';
                 }
                 else if ($obj->type == 'yesno')
                 {
-                    print $form->selectyesno('constvalue',$obj->value,1);
-                    print '</td><td>';
-                    print '<input type="hidden" name="consttype" value="yesno">';
+                    print $form->selectyesno('constvalue'.(empty($strictw3c)?'':'[]'),$obj->value,1);
+                    print '<input type="hidden" name="consttype'.(empty($strictw3c)?'':'[]').'" value="yesno">';
                 }
                 else
                 {
-                    print '<input type="text" class="flat" size="48" name="constvalue" value="'.dol_escape_htmltag($obj->value).'">';
-                    print '</td><td>';
-                    print '<input type="hidden" name="consttype" value="chaine">';
+                    print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c)?'':'[]').'" value="'.dol_escape_htmltag($obj->value).'">';
+                    print '<input type="hidden" name="consttype'.(empty($strictw3c)?'':'[]').'" value="chaine">';
                 }
                 print '</td>';
             }
-            print '<td align="center">';
-            print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button"> &nbsp;';
-            // print '<a href="adherent.php?name='.$const.'&action=unset">'.img_delete().'</a>';
-            print "</td>";
-            print "</tr>\n";
-            print "</form>\n";
+            // Submit
+            if (empty($strictw3c))
+            {
+            	print '<td align="center">';
+            	print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+	            print "</td>";
+            }    
+    	    print "</tr>\n";
+            if (empty($strictw3c)) print "</form>\n";
         }
     }
     print '</table>';
+
+    if (! empty($strictw3c)) 
+    {
+    	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+    	print "</form>\n";
+    }
 }
 
 
diff --git a/htdocs/langs/fr_FR/mailmanspip.lang b/htdocs/langs/fr_FR/mailmanspip.lang
index 3f27ae0d9c9..1118fbbff90 100644
--- a/htdocs/langs/fr_FR/mailmanspip.lang
+++ b/htdocs/langs/fr_FR/mailmanspip.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - fr_FR - mailmanspip
 CHARSET=UTF-8
-MailmanTitle=Système de listes de diffusion Mailman
+MailmanTitle=Interfacer avec le système de listes de diffusion Mailman
 MailmanSpipSetup=Configuration du module Mailman et SPIP
 TestSubscribe=Pour tester l'inscription aux listes mailman
 TestUnSubscribe=Pour tester la désincritpion aux listes mailman
@@ -11,7 +11,7 @@ SynchroSpipEnabled=Une alimentation de Spip sera réalisée
 DescADHERENT_MAILMAN_ADMINPW=Mot de passe administrateur Mailman
 DescADHERENT_MAILMAN_URL=URL d'inscription aux listes Mailman
 DescADHERENT_MAILMAN_UNSUB_URL=URL de désinscription aux listes Mailman
-SPIPTitle=Gestion de contenu SPIP
+SPIPTitle=Interfacer avec le sytème de gestion de contenu SPIP
 DescADHERENT_SPIP_SERVEUR=Serveur SPIP
 DescADHERENT_SPIP_DB=Nom base SPIP
 DescADHERENT_SPIP_USER=Login connexion base SPIP
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 5cd7890df1e..7f30ddd3fd5 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -153,7 +153,7 @@ DescADHERENT_CARD_HEADER_TEXT=Texte imprimé sur le haut des cartes d'adhérent
 DescADHERENT_CARD_TEXT=Texte imprimé sur les cartes d'adhérent (Aligné à gauche)
 DescADHERENT_CARD_TEXT_RIGHT=Texte imprimé sur les cartes d'adhérent (Aligné à droite)
 DescADHERENT_CARD_FOOTER_TEXT=Texte imprimé sur le bas des cartes d'adhérent
-DescADHERENT_MAILMAN_LISTS=Liste(s) à la quelle (auxquelles) inscrire les nouveaux adhérents (séparés par une virgule)
+DescADHERENT_MAILMAN_LISTS=Liste(s) à la quelle (auxquelles) inscrire automatiquement les adhérents validés (séparés par une virgule)
 GlobalConfigUsedIfNotDefined=Le texte défini dans la configuration du module Adhérent sera utilisé si cette valeur est non définie ici.
 MayBeOverwrited=Cette valeur peut être écrasée par le texte défini au niveau du type d'adhérent
 ShowTypeCard=Voir type '%s'