diff --git a/dev/examples/zapier/searches/thirdparty.js b/dev/examples/zapier/searches/thirdparty.js
index 93c32975992..2a6d2c6e207 100644
--- a/dev/examples/zapier/searches/thirdparty.js
+++ b/dev/examples/zapier/searches/thirdparty.js
@@ -19,6 +19,12 @@ module.exports = {
                 type: 'string',
                 label: 'Name',
                 helpText: 'Name to limit to the search to (i.e. The company or %company%).'
+            },
+            {
+                key: 'email',
+                type: 'string',
+                label: 'Email',
+                helpText: 'Email to limit to the search to.'
             }
         ],
 
@@ -32,12 +38,22 @@ module.exports = {
                     sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"
                 }
             };
+            let filter = '';
+            if (bundle.inputData.name) {
+                filter = "t.nom like \'%"+bundle.inputData.name+"%\'";
+            }
+            if (bundle.inputData.email) {
+                if (bundle.inputData.name) {
+                    filter += " and ";
+                }
+                filter += "t.email like \'"+bundle.inputData.email+"\'";
+            }
             const response = await z.request({
                 url: url,
                 // this parameter avoid throwing errors and let us manage them
                 skipThrowForStatus: true,
                 params: {
-                    sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"
+                    sqlfilters: filter
                 }
             });
             //z.console.log(response);
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index e279ced2a3d..d963763d788 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1043,7 +1043,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$regType = array();
 	if (preg_match('/\{(t+)\}/i', $mask, $regType)) {
 		$masktype = $regType[1];
-		$masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
+		$masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdparty typent_code (where n is length in mask)
 		$masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
 	} else {
 		$masktype = '';