diff --git a/ecrire/auteur_infos.php3 b/ecrire/auteur_infos.php3
index 32dfbe537e303af0aa87aeb731151f72f0b8f156..6265108057264d4f7b6517e7ca29a908e4669bf5 100644
--- a/ecrire/auteur_infos.php3
+++ b/ecrire/auteur_infos.php3
@@ -352,7 +352,7 @@ debut_cadre_relief("base-24.gif");
 // Avertissement en cas de modifs de ses propres donnees
 if (($edit_login OR $edit_pass) AND $connect_id_auteur == $id_auteur) {
 	debut_cadre_enfonce();
-	echo http_img_pack("warning.gif", 'alt="'._T('info_avertissement').'" width="48" height="48" align="right">');
+	echo http_img_pack("warning.gif", 'alt="'._T('info_avertissement').'" width="48" height="48" align="right"');
 	echo "<b>"._T('texte_login_precaution')."</b>\n";
 	fin_cadre_enfonce();
 	echo "<p>";
diff --git a/formulaire_forum-dist.html b/formulaire_forum-dist.html
index 14fd64c0dc18f3e2a38493ea8caef2af1a665cc0..d869ff7567087dad5c88306d714a193b58f3ae3b 100644
--- a/formulaire_forum-dist.html
+++ b/formulaire_forum-dist.html
@@ -1,4 +1,4 @@
-<form action='[(#HTTP_VARS{url})]' method='post' name='formulaire'>
+<form action='[(#HTTP_VARS{url})]' method='post' id='formulaire'>
       <input type='hidden' name='ajout_forum' value="oui" />
       <input type='hidden' name='id_message' value="[(#HTTP_VARS{id_message})]" />
       <input type='hidden' name='alea' value="[(#HTTP_VARS{alea})]" />
diff --git a/formulaire_inscription-dist.html b/formulaire_inscription-dist.html
index 3ea611770110c5e3c2141503c0b78685d4990e8a..7b22466c7992e4e845dc03a042e06ad6ef8fc05a 100644
--- a/formulaire_inscription-dist.html
+++ b/formulaire_inscription-dist.html
@@ -1,7 +1,7 @@
 [
 (#HTTP_VARS{mode}|choixsiegal{forum,' ',''})<:pass_forum_bla:><br /><br />][
 (#HTTP_VARS{mode}|choixsiegal{redac,' ',''})<:pass_espace_prive_bla:><br /><br />]<:form_forum_indiquer_nom_email:>
-<form name="inscription" method='post' action='#SELF' style='border: 0px; margin: 0px;'> 
+<form id="inscription" method='post' action='#SELF' style='border: 0px; margin: 0px;'> 
       <fieldset style="border: none; font-weight: bold"><legend></legend>
 	<label>
 	  <:form_pet_votre_nom:>
diff --git a/formulaire_login-dist.html b/formulaire_login-dist.html
index 5f19a3ad73f6ebb5b849ff0412405ca728a62576..24d8582fcb62da3bfee7dc9525c41000219c8a56 100644
--- a/formulaire_login-dist.html
+++ b/formulaire_login-dist.html
@@ -13,7 +13,7 @@ onclick="javascript:window.open(this.href, 'spip_inscription', 'scrollbars=yes,
 		onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=280'); return false;"><:login_motpasseoublie:></a>&#93;<br /><br />
 ]<div style="font-family: Verdana,arial,helvetica,sans-serif; font-size: 12px;">
 	<script type="text/javascript" src="ecrire/md5.js"></script>
-	<form	name="login[_(#HTTP_VARS{login})]"
+	<form	id="login[_(#HTTP_VARS{login})]"
 		action="[(#HTTP_VARS{action2})]"
 		method="post"[(#HTTP_VARS{source}|choixsiegal{spip,' ',''})
 		onSubmit='if (this.session_password.value) {
@@ -25,7 +25,7 @@ onclick="javascript:window.open(this.href, 'spip_inscription', 'scrollbars=yes,
 			<div class="reponse_formulaire">(#HTTP_VARS*{erreur})<br /><br /></div>
 ][
 			<label><b><:login_login2:></b><br /></label>(#HTTP_VARS{login}|choixsivide{' ',''})
-			<input type="text" name="var_login" class="forml" value="" size="40" />
+			<input type="text" id='var_login' name="var_login" class="forml" value="" size="40" />
 ][
 <div>
 			<input type="hidden" name="session_login_hidden" value="(#HTTP_VARS{login})" />
@@ -42,23 +42,25 @@ document.write("<:login_login:>&nbsp;<b>[(#HTTP_VARS{login})]<" + "/b><br />&#91
 	<input type='text' name='session_login' class='forml' [value="(#HTTP_VARS{login})" ]size='40' />
 </noscript>
 [<img src="(#HTTP_VARS{id_auteur}|silogoauteur)" width="75" align="right" alt="[(#HTTP_VARS{login})]">]
-</div><p><br /><br />
-		<label><b><:login_pass2:></b></label>&nbsp;<input type="password" name="session_password" class="forml" value="" size="40" />
-		<input type="hidden" name="essai_login" value="oui" />
+</div>
+<p><br /><br />
+		<label><b><:login_pass2:></b></label>&nbsp;<input type="password" name="session_password"[ id="var_login_(#HTTP_VARS{login})]" class="forml" value="" size="40" />
 		<br />&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox"
 			 name="session_remember"
 			 id="session[_(#HTTP_VARS{login})]"
-			 value="oui"[(#HTTP_VARS{prefs}|filtre_rester_connecte)]/>
+			 value="oui"[(#HTTP_VARS*{prefs}|filtre_rester_connecte)checked="checked"]/>
 		<label for="session[_(#HTTP_VARS{login})]"><:login_rester_identifie:></label>
+</p>
 		<input type="hidden" name="session_password_md5" value="" />
 		<input type="hidden" name="next_session_password_md5" value="" />
-</p>]		<input type="hidden" name="url" value="[(#HTTP_VARS{url})]" />
+		<input type="hidden" name="essai_login" value="oui" />
+]		<input type="hidden" name="url" value="[(#HTTP_VARS{url})]" />
 		<div align="right"><input type="submit" class="spip_bouton" value="<:bouton_valider:>" /></div>
 		</div>
 	</form>
-[<script type="text/javascript"><!--
-document.login(#HTTP_VARS{login}|choisir_noeud{session_password,var_login}).focus()
---></script>][
+<script type="text/javascript"><!--
+document.getElementById('var_login[_(#HTTP_VARS{login})]').focus()
+--></script>[
 	<form action="(#HTTP_VARS{auth})" method="get">
 		<fieldset>
 		<p>
diff --git a/formulaire_oubli-dist.html b/formulaire_oubli-dist.html
index 0a7bcc02f552d1d35d885ea98028578defd935e1..1a8edae04c275e8a2c13bcde75102fd7b93d75db 100644
--- a/formulaire_oubli-dist.html
+++ b/formulaire_oubli-dist.html
@@ -1,4 +1,4 @@
-<form name="oubli_form" action='spip_pass.php3' method='post'>
+<form id="oubli_form" action='spip_pass.php3' method='post'>
 	<fieldset style="border: none;"><legend></legend>[
 	<:pass_nouveau_pass:>
 	<input type='hidden' name="p" value="(#HTTP_VARS{p})">
diff --git a/inc-login_public.php3 b/inc-login_public.php3
index 9e599ae0646060dbd1a46f91beefc841790dd363..59d60e783a48171fb555f0a08f04bcb0cd64daa7 100644
--- a/inc-login_public.php3
+++ b/inc-login_public.php3
@@ -88,8 +88,6 @@ function login_pour_tous($login, $cible, $message, $action, $mode) {
 		}
 	}
 
-	include_ecrire("inc_mail.php3");
-
 	return array('formulaire_login', 0, 
 		     array_merge(array_map('addslashes', $row),
 				 array(
@@ -110,8 +108,8 @@ function login_pour_tous($login, $cible, $message, $action, $mode) {
 
 function filtre_rester_connecte($prefs) 
 {
-	$prefs = unserialize($row['prefs']);
-	return $prefs['cnx'] == 'perma' ? ' checked="checked"' : '';
+	$prefs = unserialize(stripslashes($prefs));
+	return $prefs['cnx'] == 'perma' ? ' ' : '';
 }
 
 function silogoauteur($id_auteur)
@@ -119,8 +117,4 @@ function silogoauteur($id_auteur)
   $f = _DIR_IMG . 'auton' . $id_auteur . '.jpg';
   return (@file_exists($f) ? $f : '');
 }
-
-
-function choisir_noeud($t,$v,$f) {return $t ? ("_$t" . ".$v") : ".$f";}
-
 ?>