diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index c9ea31a7117..d1a8ae622f1 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -35,10 +35,12 @@ print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
 // JQuery. Must be before other includes
+$ext='.js';
+if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
 print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />'."\n";
+print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />'."\n";
 if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
 print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </head>';
@@ -68,12 +70,15 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 <input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat" size="15" maxlength="25" value="<?php echo $login; ?>" tabindex="1" /></td>
 </tr>
 
-<?php if ($select_entity) { ?>
-	<tr><td valign="top" nowrap="nowrap"> &nbsp; <b><?php echo $langs->trans('Entity'); ?></b> &nbsp; </td>
-	<td valign="top" nowrap="nowrap">
-<?php echo $select_entity; ?>
-	</td></tr>
-<?php } ?>
+<?php
+if (! empty($hookmanager->resArray['options'])) {
+	foreach ($hookmanager->resArray['options'] as $option)
+	{
+		echo '<!-- Option by hook -->';
+		echo $option;
+	}
+}
+?>
 
 <?php if ($captcha) { ?>
 	<tr><td valign="middle" nowrap="nowrap"> &nbsp; <b><?php echo $langs->trans('SecurityCode'); ?></b></td>
diff --git a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
index 283959138c0..956263634e4 100644
--- a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
+++ b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
@@ -35,10 +35,12 @@ print '<!-- Includes for JQuery (Ajax library) -->'."\n";
 if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
 else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
 // JQuery. Must be before other includes
+$ext='.js';
+if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
 print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />'."\n";
+print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />'."\n";
 if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
 print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </head>';
@@ -59,11 +61,15 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 <div id="parameterBox">
 	<div id="logBox"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong><input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat" size="15" maxlength="25" value="<?php echo $login; ?>" tabindex="1" /></div>
 
-	<?php if ($select_entity) { ?>
-        <div><?php echo $langs->trans('Entity'); ?> &nbsp;
-        <?php echo $select_entity; ?>
-        </div>
-    <?php } ?>
+	<?php
+	if (! empty($hookmanager->resArray['options'])) {
+		foreach ($hookmanager->resArray['options'] as $option)
+		{
+			echo '<!-- Option by hook -->';
+			echo $option;
+		}
+	}
+	?>
 
     <?php if ($captcha) { ?>
         <div class="captchaBox">
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 2b7cc2c66b1..b1de66d6a96 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2008-2011 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2008-2011 Juanjo Menent        <jmenent@2byte.es>
+/* Copyright (C) 2007-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2008-2012	Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2008-2011	Juanjo Menent		<jmenent@2byte.es>
  *
  * 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
@@ -27,7 +27,8 @@ define("NOLOGIN",1);	// This means this output page does not require to be logge
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-if ($conf->ldap->enabled) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
+if (! empty($conf->ldap->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 
 $langs->load("errors");
 $langs->load("users");
@@ -42,7 +43,7 @@ if ($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)
     exit;
 }
 
-$action=GETPOST('action');
+$action=GETPOST('action', 'alpha');
 $mode=$dolibarr_main_authentication;
 if (! $mode) $mode='http';
 
@@ -50,6 +51,14 @@ $username 		= GETPOST('username');
 $passwordmd5	= GETPOST('passwordmd5');
 $conf->entity 	= (GETPOST('entity') ? GETPOST('entity') : 1);
 
+// Instantiate hooks of thirdparty module only if not already define
+if (! is_object($hookmanager))
+{
+	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+	$hookmanager=new HookManager($db);
+}
+$hookmanager->initHooks(array('passwordforgottenpage'));
+
 
 /**
  * Actions
@@ -204,31 +213,6 @@ elseif (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.
     $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
 }
 
-// Entity combobox
-$select_entity='';
-if (! empty($conf->multicompany->enabled)  && empty($conf->global->MULTICOMPANY_HIDE_LOGIN_COMBOBOX) && ! $disabled)
-{
-    $rowspan++;
-    $lastuser='';
-    $lastentity = GETPOST('entity');
-
-    if (! empty($conf->global->MULTICOMPANY_COOKIE_ENABLED))
-    {
-        $prefix=dol_getprefix();
-        $entityCookieName = 'DOLENTITYID_'.$prefix;
-        if (isset($_COOKIE[$entityCookieName]))
-        {
-            include_once DOL_DOCUMENT_ROOT . '/core/class/cookie.class.php';
-            $lastuser = '';	$lastentity = '';
-            $entityCookie = new DolCookie($conf->file->cookie_cryptkey);
-            $cookieValue = $entityCookie->_getCookie($entityCookieName);
-            list($lastuser, $lastentity) = explode('|', $cookieValue);
-        }
-    }
-
-    $select_entity = $mc->select_entities($lastentity, 'entity', ' tabindex="2"');
-}
-
 // Security graphical code
 if (function_exists("imagecreatefrompng") && ! $disabled)
 {
@@ -236,6 +220,11 @@ if (function_exists("imagecreatefrompng") && ! $disabled)
     $captcha_refresh = img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
 }
 
+// Execute hook getPasswordForgottenPageOptions
+// Should be an array with differents options in $hookmanager->resArray
+$parameters=array('entity' => GETPOST('entity','int'));
+$hookmanager->executeHooks('getPasswordForgottenPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks
+
 include $template_dir.'passwordforgotten.tpl.php';	// To use native PHP
 
 ?>
\ No newline at end of file