diff --git a/formulaire_signature-dist.html b/formulaire_signature-dist.html
index dfd3a627255ab2e740f2ca15e03e9fbf7f0acd70..a8093a3d16579cd71bf28ba4e07a5714545ea769 100644
--- a/formulaire_signature-dist.html
+++ b/formulaire_signature-dist.html
@@ -18,7 +18,8 @@
 	<br />
 	[<fieldset>
 		<p>
-			(#HTTP_VARS{site_obli}) <:form_pet_votre_site:><br />
+			(#HTTP_VARS{site_obli}|choixsiegal{oui,'', ' '})
+	    		<:form_pet_votre_site:><br />
 			<b><:form_pet_nom_site2:></b><br />
 			<input type="text" class="forml" name="nom_site" value="" size="20" />
 		</p>
@@ -27,7 +28,7 @@
 			<input type="text" class="forml" name="url_site" value="http://" size="20" />
 		</p>
 	</fieldset>][
-	(#HTTP_VARS{message})
+	(#HTTP_VARS{message}|choixsiegal{oui,' ', ''})
 	<br />
 		<fieldset>
 			<b><:form_pet_message_commentaire:></b><br />
diff --git a/inc-formulaire_signature.php3 b/inc-formulaire_signature.php3
index 7b705dc6a5b634654c743ab22f2bcda15ce8f6d0..99b700617c9d6a1d4fb4ff9b6174a221427e099c 100644
--- a/inc-formulaire_signature.php3
+++ b/inc-formulaire_signature.php3
@@ -19,25 +19,13 @@ function balise_FORMULAIRE_SIGNATURE_dyn($id_article) {
 		return reponse_signature($id_article);
 	else {
 		include(_FILE_CONNECT);
-		$query_petition = "SELECT * FROM spip_petitions WHERE id_article='$id_article'";
-		$result_petition = spip_query($query_petition);
-		
-		if (!$row = spip_fetch_array($result_petition)) return '';
-		$site_obli = $row['site_obli'];
-		$message = $row['message'];
-		$texte = $row['texte'];
-		return array('formulaire_signature',
-			     0,
-			     array(
-				'id_article' => $id_article,
-				'texte' => $texte,
-				'message' => (($message == 'oui') ? ' ' : ''),
-				'site_obli' => (($site_obli != 'oui') ? ' ' : '')
-				)
-			     );
+		$row = spip_fetch_array(spip_query("SELECT * FROM spip_petitions WHERE id_article='$id_article'"));
+		return !$row ? '': array('formulaire_signature', 0, $row);
 	}
 }
 
+function choixsiegal($a1,$a2,$v,$f) {return ($a1 == $a2) ? $v : $f;}
+
 //
 // Retour a l'ecran du lien de confirmation d'une signature de petition
 //
diff --git a/inc-public.php3 b/inc-public.php3
index c69827ca0c5537d85fc525647e1e085be2a09ac8..4fe61e6df13b6b10036f9a4351cc768e5632a995 100644
--- a/inc-public.php3
+++ b/inc-public.php3
@@ -52,10 +52,7 @@ else {
 		if ($redirect) redirige_par_entete($redirect);
 	}
 	if ($val_confirm) {
-		// il nous faut id_article ! C'est donc encore a nettoyer...
-		include_local('inc-calcul.php3');
-		calculer_contexte();
-		include_local('inc-signature.php3');
+		include_local('inc-formulaire_signature.php3');
 		reponse_confirmation($id_article, $val_confirm);
 	}