diff --git a/app/scripts/resources/scripts/app/emergency_notify/index.lua b/app/scripts/resources/scripts/app/emergency_notify/index.lua
index 273fd039ad..805b2a89d6 100644
--- a/app/scripts/resources/scripts/app/emergency_notify/index.lua
+++ b/app/scripts/resources/scripts/app/emergency_notify/index.lua
@@ -70,6 +70,12 @@
 			headers = headers..'"X-FusionPBX-Call-UUID":"'..uuid..'",';
 			headers = headers..'"X-FusionPBX-Email-Type":"emergency_call"}';
 
+		--remove quotes from caller id name and number
+			caller_id_name = caller_id_name:gsub("'", "'");
+			caller_id_name = caller_id_name:gsub([["]], """);
+			caller_id_number = caller_id_number:gsub("'", "'");
+			caller_id_number = caller_id_number:gsub([["]], """);
+
 		--prepare the subject
 			local f = io.open(file_subject, "r");
 			local subject = f:read("*all");
@@ -94,8 +100,6 @@
 			body = body:gsub(" ", " ");
 			body = body:gsub("\n", "");
 			body = body:gsub("\n", "");
-			body = body:gsub("'", "'");
-			body = body:gsub([["]], """);
 			body = trim(body);
 
 		--send the email