diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index a264411c501..000652f7a26 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -249,13 +249,13 @@ if ($action == 'validatehistory') {
 			if (!is_array($return) && $return<0) {
 				setEventMessage($accountingAccount->error, 'errors');
 			} else {
-				$suggestedid=$return['suggestedid'];
-				$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
+				$suggestedid = $return['suggestedid'];
+				$suggestedaccountingaccountfor = $return['suggestedaccountingaccountfor'];
 
-				if (!empty($suggestedid) && $suggestedaccountingaccountfor<>'') {
-					$suggestedid=$return['suggestedid'];
+				if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
+					$suggestedid = $return['suggestedid'];
 				} else {
-					$suggestedid=0;
+					$suggestedid = 0;
 				}
 			}
 
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index ab1ac678262..b61e2e74ad8 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -734,10 +734,8 @@ if ($result) {
 		// Column with checkbox
 		print '<td class="center">';
 		$ischecked = 0;
-		if (!empty($suggestedid) && $suggestedaccountingaccountfor <> '') {
+		if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
 			$ischecked = 1;
-		} elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
-			$ischecked = 0;
 		}
 		print '<input type="checkbox" class="flat checkforselect checkforselect'.$facture_static_det->id.'" name="toselect[]" value="'.$facture_static_det->id."_".$i.'"'.($ischecked ? " checked" : "").'/>';
 		print '</td>';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 4147762aff4..6fafaf1f88d 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -245,13 +245,13 @@ if ($action == 'validatehistory') {
 			if (!is_array($return) && $return<0) {
 				setEventMessage($accountingAccount->error, 'errors');
 			} else {
-				$suggestedid=$return['suggestedid'];
-				$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
+				$suggestedid = $return['suggestedid'];
+				$suggestedaccountingaccountfor = $return['suggestedaccountingaccountfor'];
 
-				if (!empty($suggestedid) && $suggestedaccountingaccountfor<>'') {
-					$suggestedid=$return['suggestedid'];
+				if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
+					$suggestedid = $return['suggestedid'];
 				} else {
-					$suggestedid=0;
+					$suggestedid = 0;
 				}
 			}
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index a189727494c..18cb15d61a5 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -725,10 +725,8 @@ if ($result) {
 		// Column with checkbox
 		print '<td class="center">';
 		$ischecked = 0;
-		if (!empty($suggestedid) && $suggestedaccountingaccountfor <> '') {
+		if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
 			$ischecked = 1;
-		} elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
-			$ischecked = 0;
 		}
 		print '<input type="checkbox" class="flat checkforselect checkforselect'.$facturefourn_static_det->id.'" name="toselect[]" value="'.$facturefourn_static_det->id."_".$i.'"'.($ischecked ? " checked" : "").'/>';
 		print '</td>';