diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 95ed7e26a13..1097692d61a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6692,6 +6692,10 @@ class Form
 											text: $.trim(match[1]) + " <" + match[2] + ">"
 										}
 									}
+									if (params.term.indexOf("<") >= 0) {
+										// Return null to disable tag creation
+										return null;
+									}
 									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
 									// console.log(match);
 									if (match !== null) {