diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index dce0e5c19bc..93462528e64 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1838,18 +1838,29 @@ class Societe extends CommonObject
 
         $name=$this->name?$this->name:$this->nom;
 
-		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-		{
-			if (($this->client) && (! empty ( $this->code_client ))) {
-				$code = $this->code_client . ' - ';
-			}
-			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))) {
-				$code .= $this->code_fournisseur . ' - ';
-			}
-			$name =$code.' '.$name;
-		}
+	if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+	{
+		if (($this->client) && (! empty ( $this->code_client ))
+			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
+			)
+		) 
+			$code = $this->code_client . ' - ';
 
-	    if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
+			)
+		) 
+			$code .= $this->code_fournisseur . ' - ';
+
+		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
+			$name =$code.' '.$name;
+		else
+			$name =$code;
+	}
+
+	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
         $result=''; $label='';
         $linkstart=''; $linkend='';