diff --git a/api/js/etemplate/Et2Email/utils.ts b/api/js/etemplate/Et2Email/utils.ts
index effaf22f01..9f241009bd 100644
--- a/api/js/etemplate/Et2Email/utils.ts
+++ b/api/js/etemplate/Et2Email/utils.ts
@@ -103,7 +103,7 @@ export function splitEmail(email_string) : { name : string, email : string }
 			split.email = parts[1].substring(0, parts[1].length - 1).trim();
 			split.name = parts[0].trim();
 			// remove quotes
-			while((split.name[0] === '"' || split.name[0] === "'") && split.name[0] === split.name.substr(-1))
+			while(split.name.length > 1 && (split.name[0] === '"' || split.name[0] === "'") && split.name[0] === split.name.substring(split.name.length - 1))
 			{
 				split.name = split.name.substring(1, split.name.length - 1);
 			}