diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 5e2b223df85..69b445d700c 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -206,7 +206,10 @@ if ($_GET["socid"])
 	print $html->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$soc->prefix_comm.'</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+	   print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$soc->prefix_comm.'</td></tr>';
+	}
 
 	if ($soc->client)
 	{
@@ -424,7 +427,7 @@ function formCategory($db,$object,$typeid)
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td width="40%">';
-	print $langs->trans("ClassifyInCategory");	
+	print $langs->trans("ClassifyInCategory");
 	print $html->select_all_categories($typeid);
 	print '</td><td>';
 	print '<input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>';
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 2b8c569f0cb..59e77f7906e 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -192,9 +192,12 @@ if ($socid > 0)
 	print '</td></tr>';
 
 	// Prefix
-	print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-	print ($objsoc->prefix_comm?$objsoc->prefix_comm:'&nbsp;');
-	print '</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+	   print ($objsoc->prefix_comm?$objsoc->prefix_comm:'&nbsp;');
+	   print '</td></tr>';
+    }
 
 	if ($objsoc->client)
 	{
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index 1fcf3b42fd5..b6a60aca1e0 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -69,9 +69,12 @@ if ($socid > 0)
     print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
 
 	// Prefix
-    print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-    print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
-    print '</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+        print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
+        print '</td></tr>';
+    }
 
     print "</table>";
 
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index fb06e37a7b9..b28576c3f37 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -69,9 +69,12 @@ if ($socid > 0)
     print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
 
     // Prefix
-    print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-    print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
-    print '</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+        print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
+        print '</td></tr>';
+    }
 
     print "</table>";
 
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index d877e37b702..86d7eefaefb 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -68,9 +68,12 @@ if ($socid > 0)
     print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
 
     // Prefix
-    print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-    print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
-    print '</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+        print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
+        print '</td></tr>';
+    }
 
     print "</table>";
 
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 5fe712e7c7a..3596f4e2436 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -95,7 +95,10 @@ if ( $societe->fetch($socid) )
 	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom','','');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
+    }
 
 	if ($societe->fournisseur)
 	{
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 506dab6307c..4d67ec05aeb 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -69,9 +69,12 @@ if ($socid > 0)
     print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
 
     // Prefix
-    print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-    print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
-    print '</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+        print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
+        print '</td></tr>';
+    }
 
     print "</table>";
 
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index c2a964c5ebe..1db0283d895 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -84,7 +84,10 @@ if ($_GET["socid"])
 	print $html->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$soc->prefix_comm.'</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$soc->prefix_comm.'</td></tr>';
+    }
 
 	if ($soc->client)
 	{
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 7acc91fbe76..2dff996b236 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -109,7 +109,15 @@ if ($_GET["socid"])
 	print $langs->trans('CustomerCode').'</td><td width="20%">';
 	print $soc->code_client;
 	if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
-	print '</td><td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td></tr>';
+    print '</td>';
+
+	// Prefix
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td>';
+    }
+    else print '<td>&nbsp;</td>';
+    print '</tr>';
 
 	print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->address)."</td></tr>";
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index d7a8f282270..4e9fc863558 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -147,7 +147,10 @@ if ($socid > 0)
 		print '</td></tr>';
 
 		// Prefix
-		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
+        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        {
+            print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
+        }
 
 	    if ($societe->client)
 	    {
diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php
index 747cd18d5ac..8a4e12239e0 100644
--- a/htdocs/societe/lien.php
+++ b/htdocs/societe/lien.php
@@ -112,7 +112,15 @@ if($_GET["socid"])
 	print $langs->trans('CustomerCode').'</td><td width="20%">';
 	print $soc->code_client;
 	if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
-	print '</td><td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td></tr>';
+	print '</td>';
+
+
+	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+	   print '<td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td>';
+	}
+	else print '<td>&nbsp;</td>';
+    print '</tr>';
 
 	print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->address)."</td></tr>";
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index d3f675ce609..00ba088e0db 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -666,12 +666,22 @@ else
 		if ($soc->particulier)
 		{
 			print '<tr><td><span class="fieldrequired">'.$langs->trans('LastName').'</span></td><td><input type="text" size="30" maxlength="60" name="nom" value="'.$soc->nom.'"></td>';
-			print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
+            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+            {
+                print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td>';
+            }
+            else print '<td>&nbsp;</td>';
+			print '</tr>';
 		}
 		else
 		{
 			print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td><input type="text" size="30" maxlength="60" name="nom" value="'.$soc->nom.'"></td>';
-			print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
+            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+            {
+                print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td>';
+            }
+            else print '<td>&nbsp;</td>';
+			print '</tr>';
 		}
 		// If javascript on, we show option individual
 		if ($conf->use_javascript_ajax)
@@ -1057,18 +1067,21 @@ else
 			print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="'.$soc->nom.'"></td></tr>';
 
 			// Prefix
-			print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-			// It does not change the prefix mode using the auto numbering prefix
-			if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $soc->prefix_comm)
-			{
-				print '<input type="hidden" name="prefix_comm" value="'.$soc->prefix_comm.'">';
-				print $soc->prefix_comm;
-			}
-			else
-			{
-				print '<input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'">';
-			}
-			print '</td>';
+            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+            {
+                print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+    			// It does not change the prefix mode using the auto numbering prefix
+	       		if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $soc->prefix_comm)
+			    {
+				    print '<input type="hidden" name="prefix_comm" value="'.$soc->prefix_comm.'">';
+				    print $soc->prefix_comm;
+			    }
+			    else
+			    {
+				    print '<input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'">';
+			    }
+			    print '</td>';
+            }
 
 			// Prospect/Customer
 			print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
@@ -1367,7 +1380,10 @@ else
 		print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
 		print '</td></tr>';
 
-		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$soc->prefix_comm.'</td></tr>';
+        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        {
+            print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$soc->prefix_comm.'</td></tr>';
+        }
 
 		if ($soc->client)
 		{
diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index 679b4dd6472..20c07917bd6 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -85,7 +85,10 @@ if ($socid > 0)
 	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
 	print '</td></tr>';
 
-    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
+    }
 
     if ($societe->client)
     {