diff --git a/app/scripts/resources/scripts/app/hangup/index.lua b/app/scripts/resources/scripts/app/hangup/index.lua
index 70410072af..54ca8d6d31 100644
--- a/app/scripts/resources/scripts/app/hangup/index.lua
+++ b/app/scripts/resources/scripts/app/hangup/index.lua
@@ -75,6 +75,12 @@
 					headers["X-FusionPBX-Domain-Name"] = domain_name;
 					headers["X-FusionPBX-Call-UUID"]   = uuid;
 					headers["X-FusionPBX-Email-Type"]  = 'missed';
+			
+				--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
 					subject = subject:gsub("${caller_id_name}", caller_id_name);
@@ -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 emails