diff --git a/htdocs/includes/modules/societe/mod_codeclient_tigre.php b/htdocs/includes/modules/societe/mod_codeclient_tigre.php
index f2a51d94df5..452982f8c39 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_tigre.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_tigre.php
@@ -229,7 +229,7 @@ class mod_codeclient_tigre extends ModeleThirdPartyCode
   		    	$substrEnd += 2;
   		    }
   	    }
-  	    else if (eregi('\{d+\}',$mask) && (eregi('\{d+\}',$mask) != '{dd}'))
+  	    else if (eregi('\{d+\}',$maskElement[$i]) && (eregi('\{d+\}',$$maskElement[$i]) != '{dd}'))
   	    {
   		    $error++;
   	    }
@@ -247,7 +247,7 @@ class mod_codeclient_tigre extends ModeleThirdPartyCode
   		    	$substrEnd += 2;
   		    }
   	    }
-  	    else if (eregi('\{m+\}',$mask) && (eregi('\{m+\}',$mask) != '{mm}'))
+  	    else if (eregi('\{m+\}',$maskElement[$i]) && (eregi('\{m+\}',$maskElement[$i]) != '{mm}'))
   	    {
   		    $error++;
   	    }
@@ -353,6 +353,10 @@ class mod_codeclient_tigre extends ModeleThirdPartyCode
   		    $maskRebuild .= $maskElement[$i];
   		    $foundCounter = 1;
   	    }
+  	    else
+  	    {
+  	    	$error++;
+  	    }
   	}
   	$this->substrBegin = $substrBegin;
   	$this->substrEnd = $substrEnd;