diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index ee37d8d5740..be6542ea115 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - en_US - errors
 ErrorDuplicateTrigger=A trigger file named '<b>%s</b>' is already loaded. Remove duplicate trigger file in directory '<b>%s</b>'.
+ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index e8f3d1467e3..bd48d97488b 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -113,6 +113,7 @@ CharacterSetDatabaseComment=Choose character set wanted for database creation.<b
 YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
 BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
 OrphelinsPaymentsDetectedByMethod=Orphelins payment detected by method %s
+RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 
 #########
 # upgrade
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 238f4e99a54..19aa67e81c8 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - fr_FR - errors
 ErrorDuplicateTrigger=Un fichier trigger du nom de '<b>%s</b>' est deja chargé. Supprimer le doublon du répertoire '<b>%s</b>'.
+ErrorFailToDeleteFile=Echec de l'effacement du fichier '<b>%s</b>'.
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 515ef2f1799..42bfc3e63a1 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -113,6 +113,7 @@ CharacterSetDatabaseComment=Veuillez choisir le codage que vous d
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Vous avez demandé la création du login de base de donnée <b>%s</b>, mais pour cela, Dolibarr doit se connecter sur le serveur <b>%s</b> via le super utilisateur <b>%s</b>.
 BecauseConnectionFailedParametersMayBeWrong=La connexion ayant échoué, les paramètres du serveur ou du super utilisateur sont peut-etre incorrects.
 OrphelinsPaymentsDetectedByMethod=Paiement orphelins detectés par la méthode %s
+RemoveItManuallyAndPressF5ToContinue=Supprimer le manuellement et appuyez sur F5 pour continuer.
 
 #########
 # upgrade
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 761c3bcb7fc..ca59683434d 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -1568,31 +1568,31 @@ function dol_loginfunction($notused,$pearstatus)
 */
 function accessforbidden($message='',$printheader=1)
 {
-  global $user, $langs;
-  $langs->load("other");
+	global $user, $langs;
+	$langs->load("other");
 
-  if ($printheader) llxHeader();
-  print '<div class="error">';
-  if (! $message) print $langs->trans("ErrorForbidden");
-  else print $message;
-  print '</div>';
-  print '<br>';
-  if ($user->login)
-  {
-    print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
-    print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
-  }
-  elseif (! empty($_SERVER["REMOTE_USER"]))
-  {
-    print $langs->trans("CurrentLogin").': <font class="error">'.$_SERVER["REMOTE_USER"]."</font><br>";
-    print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
-  }
-  else
-  {
-    print $langs->trans("ErrorForbidden3");
-  }
-  llxFooter();
-  exit(0);
+	if ($printheader && function_exists("llxHeader")) llxHeader();
+	print '<div class="error">';
+	if (! $message) print $langs->trans("ErrorForbidden");
+	else print $message;
+	print '</div>';
+	print '<br>';
+	if ($user->login)
+	{
+		print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
+		print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
+	}
+	elseif (! empty($_SERVER["REMOTE_USER"]))
+	{
+		print $langs->trans("CurrentLogin").': <font class="error">'.$_SERVER["REMOTE_USER"]."</font><br>";
+		print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
+	}
+	else
+	{
+		print $langs->trans("ErrorForbidden3");
+	}
+	if (function_exists("llxFooter")) lxFooter();
+	exit(0);
 }
 
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 8fb7c741510..fbf8776782f 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -43,6 +43,8 @@ $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
 $mode=$dolibarr_main_authentication;
 if (! $mode) $mode='http';
 
+if ($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)
+	accessforbidden();
 
 /**
  * Actions