diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 1b6e8bc5134..ed180567e13 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -37,10 +37,19 @@ if (!$user->admin)
 
 // Constante et traduction de la description du module
 $modules = array(
-'PRODUCTDESC'=>'FCKeditorForProductDescription',
-'DETAILS'=>'FCKeditorForDetails',
-'MAILING'=>'FCKeditorForMailing',
-); 
+'SOCIETE' => 'FCKeditorForCompany',
+'PRODUCTDESC' => 'FCKeditorForProductDescription',
+'DETAILS' => 'FCKeditorForDetails',
+'MAILING' => 'FCKeditorForMailing'
+);
+// Conditions pour que l'option soit proposée
+$conditions = array(
+'SOCIETE' => $conf->societe->enabled,
+'PRODUCTDESC' => ($conf->produit->enabled||$conf->service->enabled),
+'DETAILS' => ($conf->facture->enabled||$conf->propal->enabled||$conf->commande->enabled),
+'MAILING' => $conf->mailing->enabled
+);
+
 
 foreach($modules as $const => $desc)
 {
@@ -97,6 +106,9 @@ print "</tr>\n";
 // Modules
 foreach($modules as $const => $desc)
 {
+	// Si condition non remplie, on ne propose pas l'option
+	if (! $conditions[$const]) continue;
+	
 	$var=!$var;
 	print "<tr ".$bc[$var].">";
 	print '<td>'.$langs->trans($desc).'</td>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index be092e2ed32..aa631cef2db 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -533,6 +533,7 @@ DeliveryOrderModel=Products deliveries receipt model
 DeliveriesOrderAbility=Products deliveries receipt ability
 ##### FCKeditor #####
 ActivateFCKeditor=Activate FCKeditor for:
+FCKeditorForCompany=WYSIWIG creation/edition of companies description and note
 FCKeditorForProductDescription=WYSIWIG creation/edition of products/services description and note
 FCKeditorForDetails=WYSIWIG creation/edition of details lines for all entities (proposals, orders, invoices, etc...)
 FCKeditorForMailing=WYSIWIG creation/edition of mailings
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 4e5cd4420dd..2ec13e638f3 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -533,6 +533,7 @@ DeliveryOrderModel=Mod
 DeliveriesOrderAbility=Prise en charge des bons de réception client
 ##### FCKeditor #####
 ActivateFCKeditor=Activer FCKeditor pour :
+FCKeditorForCompany=Création/édition WYSIWIG de la description et note des tiers
 FCKeditorForProductDescription=Création/édition WYSIWIG de la description et note des produits/services
 FCKeditorForDetails=Création/édition WYSIWIG des lignes details des entités (commandes, propales, factures, etc...)
 FCKeditorForMailing=Création/édition WYSIWIG des mailings