diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 63db83634a8..feb1b6164e0 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -201,11 +201,7 @@ class User extends CommonObject
 				$this->user_mobile  = $obj->user_mobile;
 				$this->email		= $obj->email;
 				$this->job			= $obj->job;
-				if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) && dol_textishtml(dol_html_entity_decode($obj->signature, ENT_COMPAT | ENT_HTML401))) {
-					$this->signature				= dol_html_entity_decode($obj->signature, ENT_COMPAT | ENT_HTML401);
-				}else {
-					$this->signature				= $obj->signature;
-				}
+				$this->signature	= $obj->signature;
 				$this->admin		= $obj->admin;
 				$this->note			= $obj->note;
 				$this->statut		= $obj->statut;
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index cec4686ba5f..7a1059acd89 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1205,7 +1205,11 @@ else
 
             // Signature
             print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>';
-            print dol_textishtml($object->signature)?$object->signature:dol_nl2br($object->signature,1,false);
+            if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) && dol_textishtml(dol_html_entity_decode($object->signature, ENT_COMPAT | ENT_HTML401))) {
+            	print dol_html_entity_decode($object->signature, ENT_COMPAT | ENT_HTML401);
+            }else {
+            	print dol_nl2br($object->signature,1,false);
+            }
             print "</td></tr>\n";
 
             // Hierarchy