diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index dfc4772c583..8081f06dcd3 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -136,32 +136,38 @@ print '<td align="center" width="80">'.$langs->trans("Activated").'</td>';
 print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
 print '</tr>';
 
-// Disable clear password in database
+// Enable Captcha code
+$var=!$var;
+print "<tr ".$bc[$var].">";
+print '<td colspan="3">'.$langs->trans("UseCaptchaCode").'</td>';
+print '<td align="center" width="60">';
+if($conf->global->MAIN_SECURITY_ENABLECAPTCHA == 1)
+{
+ print img_tick();
+}
+print '</td>';
+print '<td align="center" width="100">';
 if (function_exists("imagecreatefrompng"))
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
-  print '<td colspan="3">'.$langs->trans("UseCaptchaCode").'</td>';
-  print '<td align="center" width="60">';
-  if($conf->global->MAIN_SECURITY_ENABLECAPTCHA == 1)
-  {
-	  print img_tick();
-  }
-  print '</td>';
-  print '<td align="center" width="100">';
-  if ($conf->global->MAIN_SECURITY_ENABLECAPTCHA == 0)
-  {
-	  print '<a href="security_other.php?action=activate_captcha">'.$langs->trans("Activate").'</a>';
-  }
-  if($conf->global->MAIN_SECURITY_ENABLECAPTCHA == 1)
-  {
-	  print '<a href="security_other.php?action=disable_captcha">'.$langs->trans("Disable").'</a>';
-  }
-  print "</td>";
-
-  print "</td>";
-  print '</tr>';
+	if ($conf->global->MAIN_SECURITY_ENABLECAPTCHA == 0)
+	{
+		print '<a href="security_other.php?action=activate_captcha">'.$langs->trans("Activate").'</a>';
+	}
+	if($conf->global->MAIN_SECURITY_ENABLECAPTCHA == 1 && function_exists("imagecreatefrompng"))
+	{
+		print '<a href="security_other.php?action=disable_captcha">'.$langs->trans("Disable").'</a>';
+	}
 }
+else
+{
+	$html = new Form($db);
+	$desc = $html->textwithwarning('',$langs->transnoentities("EnableGDLibraryDesc"),1);
+	print $desc;
+}
+print "</td>";
+
+print "</td>";
+print '</tr>';
 
 print '</table>';
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 209fcf3f208..cf1e5bea1dd 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -34,6 +34,7 @@ NextValueForCreditNotes=Next value (credit notes)
 MustBeLowerThanPHPLimit=Note: your PHP limits upload size to <b>%s</b> %s, whatever is this parameter's value
 NoMaxSizeByPHPLimit=Note: No limit are built in your PHP
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
+UseCaptchaCode=Use Captcha code
 ComptaSetup=Accounting module setup
 UserSetup=Users' management setup
 MenuSetup=Menus management setup
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index e98663065ba..02e250f7bd5 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -79,6 +79,7 @@ BugTracker=Bug tracker
 SendNewPasswordDesc=This form allows you to request a new passord. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
 BackToLoginPage=Back to login page
 AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
+EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option.
 ##### Webcal #####
 LoginWebcal=Login for Webcalendar
 AddCalendarEntry=Add entry in calendar
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 6265f367ff6..abd9529cf0b 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -34,6 +34,7 @@ NextValueForCreditNotes=Prochaine valeur (avoirs)
 MustBeLowerThanPHPLimit=Remarque: Votre PHP limite naturellement la taille à <b>%s</b> %s maximum, quelque soit la valeur de ce paramètre
 NoMaxSizeByPHPLimit=Aucune limite interne à votre serveur PHP
 MaxSizeForUploadedFiles=Taille maximum des documents uploadés (0 pour interdire l'upload)
+UseCaptchaCode=Utilisation de codes Captcha
 ComptaSetup=Configuration du module Comptabilité
 UserSetup=Configuration gestion des utilisateurs
 MenuSetup=Administration des menus par base de données
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 3a9b5c18a2c..986cbc63b49 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -79,6 +79,7 @@ BugTracker=Bug tracker
 SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre user.<br>La modification du mot de passe ne sera effective qu'après clic par le destinataire du lien de confirmation inclut dans ce mail.<br>Surveillez votre messagerie.
 BackToLoginPage=Retour page de connexion
 AuthenticationDoesNotAllowSendNewPassword=Le mode d'authentification de Dolibarr est configuré à "<b>%s</b>".<br>Dans ce mode, Dolibarr n'a pas la possibilité de connaitre ni modifier votre mot de passe.<br>Contacter votre administrateur pour connaitre les modalités de changement.
+EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre PHP pour pouvoir activer cette option.
 ##### Webcal #####
 LoginWebcal=Login Webcalendar
 AddCalendarEntry=Ajouter entrée dans le calendrier