diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 56793184f65..93e0196f1ae 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -634,18 +634,22 @@ if (empty($reshook))
                 }
                 else
 				{
-					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' || ($result==-3 && in_array('ErrorCustomerCodeAlreadyUsed', $object->errors))) // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					if ($result==-3 && in_array('ErrorCustomerCodeAlreadyUsed', $object->errors))
 					{
 						$duplicate_code_error = true;
 						$object->code_client = null;
 					}
 
-					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' || ($result==-3 && in_array('ErrorSupplierCodeAlreadyUsed',$object->errors))) // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					if ($result==-3 && in_array('ErrorSupplierCodeAlreadyUsed',$object->errors))
 					{
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;
 					}
 
+					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+						$duplicate_code_error = true;
+					}
+
                     setEventMessages($object->error, $object->errors, 'errors');
                    	$error++;
                 }