diff --git a/.gitattributes b/.gitattributes
index f079f8be9d424d987e2e24d4a39c95dad12e52b3..b076b836c0c1d06d6855ae07060dbe49d3299d35 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,7 +2,7 @@
 IMG/logo_spip.jpg -text
 /INSTALL.txt -text
 dist/choix_mots.html -text
-dist/spip_style_prive.html -text
+dist/style_prive.html -text
 ecrire/charsets/cp1251.php -text
 ecrire/charsets/cp1256.php -text
 ecrire/charsets/html.php -text
diff --git a/dist/spip_style_prive.html b/dist/style_prive.html
similarity index 100%
rename from dist/spip_style_prive.html
rename to dist/style_prive.html
diff --git a/spip_cookie.php3 b/ecrire/exec_spip_action_cookie.php
similarity index 98%
rename from spip_cookie.php3
rename to ecrire/exec_spip_action_cookie.php
index 4cc3a56c2922ada670ca8a740624b6895494c034..4776553f2ef29cd115d074d0c0061490a712140d 100644
--- a/spip_cookie.php3
+++ b/ecrire/exec_spip_action_cookie.php
@@ -10,9 +10,11 @@
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-include ("ecrire/inc_version.php");
-include_ecrire ("inc_session");
-include_ecrire('inc_cookie');
+function spip_action_cookie_dist() {
+	include_ecrire ("inc_session");
+	include_ecrire('inc_cookie');
+	spip_cookie_dist();
+}
 
 function auth_http($url, $essai_auth_http) {
 	global $_SERVER;
@@ -274,6 +276,4 @@ else {
 }
 }
 
-spip_cookie_dist()
-
 ?>
diff --git a/ecrire/inc_presentation.php b/ecrire/inc_presentation.php
index 31b7b3b3175d62d7ad84a3d4c46920343c5b9c1e..bab7262d1084ea8b513b5efa38e9d5ee14dd53c3 100644
--- a/ecrire/inc_presentation.php
+++ b/ecrire/inc_presentation.php
@@ -1773,7 +1773,7 @@ function envoi_link($nom_site_spip, $rubrique="") {
 
 	// CSS espace prive
 	. '<link rel="stylesheet" type="text/css" href="'
-	. generer_url_public('spip_style_prive', $args) .'" />
+	. generer_url_public('style_prive', $args) .'" />
 '
 	// CSS calendrier
 	. '<link rel="stylesheet" type="text/css" href="' . _DIR_IMG_PACK
diff --git a/formulaires/formulaire_login.html b/formulaires/formulaire_login.html
index 517c0c76439a5fc379184e94607a24d02b759220..a333386aa7cc86cb1857892f499e9164b91eb966 100644
--- a/formulaires/formulaire_login.html
+++ b/formulaires/formulaire_login.html
@@ -27,7 +27,10 @@
 	alt="[(#ENV{login_alt})]" /></div>]
 	<input type="hidden" name="session_login_hidden" value="(#ENV{login})" />
 <script type="text/javascript"><!--
-document.write("<:login_login:>&nbsp;<strong>[(#ENV{login_alt})]<" + "/strong><br />&#91;<a style='color: #e86519' href='[(#ENV{action2})]?cookie_admin=non[&amp;url=(#ENV*{url}|urlencode)][&amp;retour=(#ENV*{self}|urlencode)]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>&#93;")
+document.write("<:login_login:>&nbsp;<strong>[(#ENV{login_alt})]<" + "/strong><br />&#91;<a style='color: #e86519' href='[(#ENV{action2}
+	|parametre_url{cookie_admin,non}
+	|parametre_url{url,#ENV*{url}}
+	|parametre_url{retour,#ENV*{self}})]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>&#93;")
 //--></script>
 <noscript>
 	<p class='notes' style='font-size: 130%'>