diff --git a/action/ia_nojs.php b/action/ia_nojs.php
index 1deafc20ba037cff6303a161c87016b0c7f21bb3..81ef652af5e85c5511548d6c838735028974c8c5 100644
--- a/action/ia_nojs.php
+++ b/action/ia_nojs.php
@@ -5,7 +5,7 @@ function action_ia_nojs () {
 	// pour une semaine
 	setcookie("no_js", "no_js", time()+(3600*24*7));	
 		
-	@header("Refresh: 0; Url="._request("retour"));
+	@header("Refresh: 0; Url=".parametre_url(urldecode(_request("retour")), "no_js","oui", "&"));
 	echo " ";	
 }
 
diff --git a/inclure-ajaxload.php b/inclure-ajaxload.php
index c2e4d37a6c937fedac14e3f4aa5b02a34a534c23..f0e1e18bfb8423dd45dea628acd4b38ed52c1e65 100644
--- a/inclure-ajaxload.php
+++ b/inclure-ajaxload.php
@@ -106,7 +106,7 @@ function INCLUREAJAXLOAD_affichage_final($page) {
 
 	// Si le visiteur est un robot de moteur de recherche,
 	// reconstituer les pages completes
-	if(_IS_BOT || $_COOKIE["no_js"] == "no_js" ) {
+	if(_IS_BOT || $_COOKIE["no_js"] == "no_js" || _request("no_js") == "oui" ) {
 		include_spip("inc/filtres");
 		include_spip("public/assembler");
 		$page = preg_replace_callback(",(<div class='includeajax[^\']*'><a href=\"(.*)\" rel=\"(.*)\">.*</a></div>),msU", "remettre_fond_ajax", $page);
@@ -119,11 +119,11 @@ function INCLUREAJAXLOAD_affichage_final($page) {
 function INCLUREAJAXLOAD_insert_head($flux) {
 	$flux .= "\n<script src=\"".find_in_path('javascript/inclure-ajaxload.js')."\" type=\"text/javascript\"></script>";
 
-$flux = '<?php if ($_COOKIE["no_js"] != "no_js" && !_IS_BOT) { ?>
+$flux = '<?php if ($_COOKIE["no_js"] != "no_js" && !_IS_BOT && _request("no_js") != "oui") { ?>
 <script type="text/javascript"><!--
 document.write("<\/script><script>/*");
 //--></script>
-<meta http-equiv="refresh" content="2; url=spip.php?action=ia_nojs&amp;retour=<?php echo urlencode(parametre_url(self(),\'no_js\',\'oui\'));?>" />
+<meta http-equiv="refresh" content="2; url='.$GLOBALS["meta"]["adresse_site"].'/spip.php?action=ia_nojs&amp;retour=<?php echo urlencode(self(\'&\'));?>" />
 <script type="text/javascript">/* */</script>
 <?php } else { ?>
 <script type="text/javascript"><!--
diff --git a/plugin.xml b/plugin.xml
index b0bd6e27c536de4cd7202b76077f1193c1d945ef..d5b5b1a3ae495ba15e75b87e9a8d3636875ed29f 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,7 +4,7 @@
 	Fil &amp; ARNO* &#169; 2009 - GNU/GPL
 	</auteur>
 	<version>
-	0.7
+	0.8
 	</version>
 	<etat>
 	test