diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 5b18393830d..2889b38127b 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -51,14 +51,14 @@ print '<center><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo_2.png" alt="Doliba
 if ($mesg) print $mesg.'<br>';
 
 print "<br>";
-print $langs->trans("SetupDescription1")."<br>";
-print $langs->trans("AreaForAdminOnly").' '.img_picto($langs->trans("Administrator"),'star').'<br>';
+print $langs->trans("SetupDescription1").'<br>';
+print $langs->trans("AreaForAdminOnly").'<br>';
 
 print "<br>";
 print $langs->trans("SetupDescription2")."<br>";
 print "<br>";
 print img_picto('','puce').' '.$langs->trans("SetupDescription3")."<br>";
-print "<br>";
+//print "<br>";
 print img_picto('','puce').' '.$langs->trans("SetupDescription4")."<br>";
 print "<br>";
 
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 869c5d3f03d..644aac5b751 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -632,7 +632,7 @@ Audit = Auditoria
 ListEvents = Auditoria d'esdeveniments
 ListOfSecurityEvents = Llistat d'esdeveniments de seguretat Dolibarr
 LogEventDesc = Podeu habilitar el registre d'esdeveniments de seguretat Dolibarr aquí. Els administradors poden veure el seu contingut a través de menú <b>Eines del sistema->Auditoria</b>. Atenció, aquesta característica pot consumir una gran quantitat de dades a la base de dades.
-AreaForAdminOnly = Aquestes funcions només són accessibles a un usuari administrador. La funció d'administrador i els ajuts per als administradors són definides en Dolibarr pel següent símbol:
+AreaForAdminOnly = Aquestes funcions només són accessibles a un usuari administrador.
 SystemInfoDesc = La informació del sistema és informació tècnica accessible només en només lectura als administradors.
 SystemAreaForAdminOnly = Aquesta àrea només és accessible als usuaris de tipus administradors. Cap permís Dolibarr permet estendre el cercle de usuaris autoritzats a aquesta áera.
 CompanyFundationDesc = Edita en aquesta pàgina tota la informació coneguda sobre l'empresa o associació a administrar
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9f064a72167..6971fd39705 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -634,7 +634,7 @@ Audit=Audit
 ListEvents=Audit events
 ListOfSecurityEvents=List of Dolibarr security events
 LogEventDesc=You can enable the log for Dolibarr security events here. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only. Administrator features and help are identified in Dolibarr by the following picto:
+AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellanous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or fundation you need to manage
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index cc56fbd9950..8a063e2b903 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -632,7 +632,7 @@ Audit = Auditoría
 ListEvents = Auditoría de eventos
 ListOfSecurityEvents = Listado de eventos de seguridad Dolibarr
 LogEventDesc = Puede habilitar el registro de eventos de seguridad Dolibarr aquí. Los administradores pueden ver su contenido a través de menú <b>Herramientas del sistema - Auditoria</b>.Atención, esta característica puede consumir una gran cantidad de datos en la base de datos.
-AreaForAdminOnly = Estas funciones solo son accesibles a un usuario administrador. La función de administrador y las ayudas para los administradores son definidas en Dolibarr por el siguiente símbolo:
+AreaForAdminOnly = Estas funciones solo son accesibles a un usuario administrador.
 SystemInfoDesc = La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
 SystemAreaForAdminOnly = Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta áera.
 CompanyFundationDesc = Editar en esta página toda la información conocida sobre la empresa o asociación a administrar
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 57c5a9739fe..021cb7ce16d 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -36,6 +36,7 @@ ErrorNoVATRateDefinedForSellerCountry = Error, ningún tipo de IVA definido para
 ErrorFailedToSaveFile = Error, el registro del archivo falló.
 ErrorOnlyPngJpgSupported = Error, solamente se soportan los formatos de imagen jpg y png.
 ErrorImageFormatNotSupported = Su PHP no soporta las funciones de conversión de este formato de imagen.
+GoToHelpPage=Read help (may require an Internet access)
 RecordSaved = Registro guardado
 LevelOfFeature = Nivel de funciones
 NotDefined = No definida
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 28c2f4925ec..7490a1a9e78 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -633,7 +633,7 @@ Audit=Audit
 ListEvents=Audit évènements
 ListOfSecurityEvents=Liste des évènements de sécurité Dolibarr
 LogEventDesc=Vous pouvez activer ici, le traçage de l'historique des evènements d'audit de sécurité. Cet historique est consultable aux administrateurs dans le menu <b>Outils systèmes - Audit</b>. Attention, cette fonctionnalité peut consommer un gros volume de données.
-AreaForAdminOnly=Ces fonctions ne sont accessibles qu'à un utilisateur administrateur. La fonction d'administrateur et les aides pour les administrateurs sont identifiées dans Dolibarr par le picto suivant:
+AreaForAdminOnly=Ces fonctions ne sont accessibles qu'à un utilisateur administrateur.
 SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement.
 SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateurs. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace.
 CompanyFundationDesc=Éditer sur cette page toutes les informations connues sur la société ou association que vous devez gérer
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 9441602572a..6dfb7d3f940 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -36,6 +36,7 @@ ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux tva défini pour le pay
 ErrorFailedToSaveFile=Erreur, l'enregistrement du fichier a échoué.
 ErrorOnlyPngJpgSupported=Erreur, seuls les formats images .jpg et .png sont supportés.
 ErrorImageFormatNotSupported=Votre PHP ne supporte pas les fonctions de conversion de ce format d'image.
+GoToHelpPage=Consulter l'aide (peut nécessiter un accès internet) 
 RecordSaved=Enregistrement sauvegardé
 LevelOfFeature=Niveau de fonctionnalités
 NotDefined=Non défini
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 18204b11a3c..7548ba86811 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -630,7 +630,7 @@ Audit=Auditoría
 ListEvents=Auditoría de eventos
 ListOfSecurityEvents=Listado de eventos de segurança Dolibarr
 LogEventDesc=Pode activar o registo de eventos de segurança Dolibarr aquí. os administradores podem ver o seu conteudo a través de menu <b>ferramentas do sistema - Auditoria</b>.Atenção, esta característica pode consumir uma gran quantidade de dados na base de dados.
-AreaForAdminOnly=Estas funções solo são accesibles a um Utilizador administrador. a função de administrador e as ayudas para os administradores são definidas em Dolibarr por o siguiente símbolo:
+AreaForAdminOnly=Estas funções solo são accesibles a um Utilizador administrador.
 SystemInfoDesc=Esta informação do sistema é informação técnica acessíveis só de leitura a aos administradores.
 SystemAreaForAdminOnly=Esta área só é acessíveis a os Utilizadores de tipo administradores. nenhum permissão Dolibarr permite extender o círculo de Utilizadores autorizados a esta áera.
 CompanyFundationDesc=Editar em esta página toda a informação conhecida sobre a empresa o associação a administrar
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 1fbbd06bc73..a53e343b9f6 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -90,7 +90,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	print '</head>'."\n";
 
 	// Body
-	print '<body class="body" onload="donnefocus();">'."\n";
+	print '<body class="body" onload="donnefocus();">'."\n\n";
 
 	// Start Form
 	print '<form id="login" name="login" method="post" action="';
@@ -99,15 +99,15 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	print '">'."\n";
 
 	// Table 1
-	print '<table cellpadding="0" cellspacing="0" border="0" align="center" width="450">';
 	$title='Dolibarr '.DOL_VERSION;
 	if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
-	print '<tr class="vmenu"><td align="center">'.$title.'</td></tr>';
-	print '</table>';
-	print '<br>';
+	print '<table summary="'.$title.'" cellpadding="0" cellspacing="0" border="0" align="center" width="480">'."\n";;
+	print '<tr class="vmenu"><td align="center">'.$title.'</td></tr>'."\n";
+	print '</table>'."\n";
+	print '<br>'."\n\n";
 
 	// Table 2
-	print '<table cellpadding="2" align="center" width="450">';
+	print '<table summary="Login area" cellpadding="2" align="center" width="480">'."\n";
 
 	print '<tr><td colspan="3">&nbsp;</td></tr>';
 
@@ -117,10 +117,8 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	print '<td align="left" valign="bottom"> &nbsp; <b>'.$langs->trans("Login").'</b>  &nbsp;</td>';
 	print '<td valign="bottom"><input type="text" id="username" name="username" class="flat" size="15" maxlength="25" value="'.(isset($_REQUEST["username"])?$_REQUEST["username"]:'').'" tabindex="1" /></td>';
 
-	$title=$langs->trans("SessionName").': '.session_name();
-	if ($conf->main_authentication) $title.=", ".$langs->trans("AuthenticationMode").': '.$conf->main_authentication;
-
 	// Show logo (search in order: small company logo, large company logo, theme logo, common logo)
+	$title='';
 	$width=0;
 	$urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
 	if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small))
@@ -132,11 +130,11 @@ function dol_loginfunction($langs,$conf,$mysoc)
 		$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
 		$width=96;
 	}
-	elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png'))
+	elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
 	{
-		$urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png';
+		$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
 	}
-	print '<td rowspan="2" align="center"><img title="'.$title.'" src="'.$urllogo.'"';
+	print '<td rowspan="2" align="center"><img alt="logo" title="'.$title.'" src="'.$urllogo.'"';
 	if ($width) print ' width="'.$width.'"';
 	print '></td>';
 	print '</tr>'."\n";
@@ -174,12 +172,12 @@ function dol_loginfunction($langs,$conf,$mysoc)
 		print '<tr><td colspan="3" align="center"><a style="color: #888888; font-size: 10px" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php">('.$langs->trans("PasswordForgotten").')</a></td></tr>';
 	}
 
-	print '</table>';
+	print '</table>'."\n";
 
 	// Hidden fields
-	print '<input type="hidden" name="loginfunction" value="loginfunction" />';
+	print '<input type="hidden" name="loginfunction" value="loginfunction" />'."\n";
 
-	print '</form>';
+	print '</form>'."\n";
 
 	// Message
 	if (! empty($_SESSION["dol_loginmesg"]))
@@ -187,11 +185,11 @@ function dol_loginfunction($langs,$conf,$mysoc)
 		print '<center><table width="60%"><tr><td align="center" class="small"><div class="error">';
 		print $_SESSION["dol_loginmesg"];
 		$_SESSION["dol_loginmesg"]="";
-		print '</div></td></tr></table></center>';
+		print '</div></td></tr></table></center>'."\n";
 	}
 	if (! empty($conf->global->MAIN_HOME))
 	{
-		print '<center><table cellpadding="0" cellspacing="0" border="0" align="center" width="750"><tr><td align="center">';
+		print '<center><table summary="info" cellpadding="0" cellspacing="0" border="0" align="center" width="750"><tr><td align="center">';
 		$i=0;
 		while (eregi('__\(([a-zA-Z]+)\)__',$conf->global->MAIN_HOME,$reg) && $i < 100)
 		{
@@ -199,11 +197,13 @@ function dol_loginfunction($langs,$conf,$mysoc)
 			$i++;
 		}
 		print nl2br($conf->global->MAIN_HOME);
-		print '</td></tr></table></center><br>';
+		print '</td></tr></table></center><br>'."\n";
 	}
 
 	print "\n";
-	print '<!-- urlfrom in session = '.(isset($_SESSION["urlfrom"])?$_SESSION["urlfrom"]:'').' -->';
+	print '<!-- authentication mode = '.$conf->main_authentication.' -->'."\n";
+	print '<!-- cookie name used for this session = '.session_name().' -->'."\n";
+	print '<!-- urlfrom in this session = '.(isset($_SESSION["urlfrom"])?$_SESSION["urlfrom"]:'').' -->'."\n";
 
 	// Fin entete html
 	print "\n</body>\n</html>";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 03fb16a416f..22e7ba9b9c9 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
diff --git a/htdocs/theme/auguria/img/login_logo.png b/htdocs/theme/auguria/img/login_logo.png
deleted file mode 100644
index 2337863c340..00000000000
Binary files a/htdocs/theme/auguria/img/login_logo.png and /dev/null differ
diff --git a/htdocs/theme/dolibarr_logo_2.png b/htdocs/theme/dolibarr_logo_2.png
deleted file mode 100644
index 7f29b619432..00000000000
Binary files a/htdocs/theme/dolibarr_logo_2.png and /dev/null differ
diff --git a/htdocs/theme/eldy/img/login_logo.png b/htdocs/theme/eldy/img/login_logo.png
deleted file mode 100644
index 2337863c340..00000000000
Binary files a/htdocs/theme/eldy/img/login_logo.png and /dev/null differ
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 784d85c9668..de88ebf2037 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,11 +16,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/**     
-        \file       htdocs/user/passwordforgotten.php
-        \brief      Page demande nouveau mot de passe
-        \version    $Id$
-*/
+/**
+ *       \file       htdocs/user/passwordforgotten.php
+ *       \brief      Page demande nouveau mot de passe
+ *       \version    $Id$
+ */
 
 // This is to make Dolibarr working with Plesk
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
@@ -88,10 +88,10 @@ if ($_POST["action"] == 'buildnewpassword' && $_POST["username"])
 {
 	require_once DOL_DOCUMENT_ROOT.'/../external-libs/Artichow/Artichow.cfg.php';
 	require_once ARTICHOW."/AntiSpam.class.php";
-	
+
 	// We create anti-spam object
 	$object = new AntiSpam();
-	
+
 	// Verify code
 	if (! $object->check('dol_antispam_value',$_POST['code'],true))
 	{
@@ -120,7 +120,7 @@ if ($_POST["action"] == 'buildnewpassword' && $_POST["username"])
 			        // Failed
 			        $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
 			    }
-			    else 
+			    else
 			    {
 			        // Success
 			        if ($edituser->send_password($user,$newpassword,1) > 0)
@@ -145,7 +145,7 @@ if ($_POST["action"] == 'buildnewpassword' && $_POST["username"])
 /*
  * Affichage page
  */
- 
+
 $conf->css  = "theme/".$conf->theme."/".$conf->theme.".css";
 // Si feuille de style en php existe
 if (file_exists(DOL_DOCUMENT_ROOT.'/'.$conf->css.".php")) $conf->css.=".php";
@@ -198,7 +198,7 @@ print '<form id="login" action="'.$_SERVER["PHP_SELF"].'" method="post" name="lo
 print '<input type="hidden" name="action" value="buildnewpassword">'."\n";
 
 // Table 1
-print '<table cellpadding="0" cellspacing="0" border="0" align="center" width="450">'."\n";
+print '<table cellpadding="0" cellspacing="0" border="0" align="center" width="480">'."\n";
 if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png'))
 {
   print '<tr><td colspan="3" style="text-align:center;">';
@@ -217,7 +217,7 @@ if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') $disabled='';
 if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled='';				// To force button enabled
 
 // Table 2
-print '<table cellpadding="2" align="center" width="450">'."\n";
+print '<table cellpadding="2" align="center" width="480">'."\n";
 
 print '<tr><td colspan="3">&nbsp;</td></tr>'."\n";
 
@@ -256,13 +256,13 @@ if (function_exists("imagecreatefrompng") && ! $disabled)
 	//print "Info session: ".session_name().session_id();print_r($_SESSION);
 	print '<tr><td align="left" valign="middle" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("SecurityCode").'</b></td>';
 	print '<td valign="top" nowrap="nowrap" align="left" class="e">';
-	
+
 	print '<table><tr>';
 	print '<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="2"></td>';
 	print '<td><img src="'.DOL_URL_ROOT.'/lib/antispamimage.php" border="0" width="128" height="36"></td>';
 	print '<td><a href="'.$_SERVER["PHP_SELF"].'">'.img_refresh().'</a></td>';
 	print '</tr></table>';
-	
+
 	print '</td>';
 	print '</tr>';
 }
@@ -290,7 +290,7 @@ else
 print '</td></tr></table><br>';
 
 if ($message)
-{ 
+{
 	print '<table width="90%"><tr><td align="center" style="font-size: 12px;">';
 	print $message.'</td></tr></table><br>';
 }