diff --git a/ecrire/inc_spip_action_test_dirs.php b/ecrire/inc_spip_action_test_dirs.php
index 6dfb3fbc466e295eeb81bdace8d009376a321ada..53b33e611806a88792c059dcdb1030f4b86e15c4 100644
--- a/ecrire/inc_spip_action_test_dirs.php
+++ b/ecrire/inc_spip_action_test_dirs.php
@@ -105,7 +105,7 @@ if ($bad_dirs OR $absent_dirs) {
 
  } else {
 	if (!_FILE_CONNECT)
-		header("Location: " . _DIR_RESTREINT_ABS . "install" . _EXTENSION_PHP . "?etape=1");
+		header("Location: " . generer_url_ecrire(_DIR_RESTREINT_ABS . "install",  "etape=1"));
 	else
 		header("Location: " . _DIR_RESTREINT_ABS);
  }
diff --git a/ecrire/inc_upgrade.php b/ecrire/inc_upgrade.php
index cfb343bb1f34794ad29a5d5439c0b02ea7fe7457..01e1adbab79798dccf0fd89d29a387077072c9fc 100644
--- a/ecrire/inc_upgrade.php
+++ b/ecrire/inc_upgrade.php
@@ -18,7 +18,7 @@ function upgrade_dist()
   global $connect_id_auteur, $spip_version, $reinstall;
 
   if (!_FILE_CONNECT) {
-	header("Location: " . 'install' . _EXTENSION_PHP);
+	header("Location: " . generer_url_ecrire("install"));
 	exit;
   }
 
@@ -114,7 +114,7 @@ function info_install()
  {
 	// Soit on est dans ecrire/ et on envoie sur l'installation
 	if (@file_exists("inc_version" . _EXTENSION_PHP)) {
-		header("Location: " . 'install' . _EXTENSION_PHP);
+	header("Location: " . generer_url_ecrire("install"));
 		exit;
 	}
 	// Soit on est dans le site public
diff --git a/inc-public-global.php3 b/inc-public-global.php3
index d42eb289815aaf79ad2795ea973c9774b80828fe..10b865c457626528130b2c7cc128f5fd95c460c4 100644
--- a/inc-public-global.php3
+++ b/inc-public-global.php3
@@ -59,8 +59,7 @@ function calcule_header_et_page ($fond) {
 		else {
 			$link = new Link();
 			$link->addvar('var_mode', 'debug');
-			redirige_par_entete('spip_login' . _EXTENSION_PHP . '?url='
-				.urlencode($link->getUrl()));
+			redirige_par_entete(generer_url_public('spip_login'), '?url='.urlencode($link->getUrl()));
 			exit;
 		}
 	}
diff --git a/spip_cookie.php3 b/spip_cookie.php3
index 702e8b39dc73d112dc3cff89e339eb5e501ae57c..96c188358944af84f1861a3485340c262ef48df7 100644
--- a/spip_cookie.php3
+++ b/spip_cookie.php3
@@ -99,9 +99,8 @@ if ($essai_auth_http AND !$ignore_auth_http) {
 // cas particulier, logout dans l'espace public
 if ($logout_public) {
 	$logout = $logout_public;
-	if (!$url)
-		$url = 'index' . _EXTENSION_PHP;
-}
+	if (!$url)  $url = $GLOBALS['meta']['adresse_site'];
+ }
 // tentative de logout
 if ($logout) {
 	verifier_visiteur();
@@ -189,7 +188,7 @@ if ($essai_login == "oui") {
 
 	if (!$ok) {
 		if (ereg(_DIR_RESTREINT_ABS, $redirect))
-			$redirect = "spip_login" . _EXTENSION_PHP;
+			$redirect = generer_url_public('spip_login');
 		$redirect .= (strpos($redirect, "?") ? "&" : "?") . "var_login=$login";
 		if ($session_password || $session_password_md5)
 			$redirect .= '&var_erreur=pass';
@@ -200,7 +199,7 @@ if ($essai_login == "oui") {
 // cookie d'admin ?
 if ($cookie_admin == "non") {
 	if (!$retour)
-		$retour = 'spip_login' . _EXTENSION_PHP .'?url='.urlencode($url);
+		$retour = generer_url_public('spip_login', 'url='.urlencode($url));
 
 	spip_setcookie('spip_admin', $spip_admin, time() - 3600 * 24);
 	$redirect = ereg_replace("([?&])var_login=[^&]*&?", '\1', $retour);