diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 4503c9ee44..5c7650fc95 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -41,6 +41,7 @@ else {
 	require_once "includes/header.php";
 	require_once "includes/paging.php";
 
+
 //xml cdr include
 	$rows_per_page = 100;
 	require_once "xml_cdr_inc.php";
diff --git a/includes/install/scripts/xml_handler.lua b/includes/install/scripts/xml_handler.lua
index 4d7a357a2d..48c87cc130 100644
--- a/includes/install/scripts/xml_handler.lua
+++ b/includes/install/scripts/xml_handler.lua
@@ -145,7 +145,7 @@
 					if (string.len(row.dial_string) > 0) then
 						dial_string = row.dial_string;
 					else
-						dial_string = "{sip_invite_domain=${domain_name},presence_id=${dialed_user}@${domain_name}}${sofia_contact(${dialed_user}@${domain_name})}";
+						dial_string = "{sip_invite_domain=${domain_name},presence_id=${dialed_user}@${domain_name}}${sofia_contact(*/${dialed_user}@${domain_name})}";
 					end
 			end);
 
diff --git a/includes/lib_switch.php b/includes/lib_switch.php
index b3d7616f40..bd109a2929 100644
--- a/includes/lib_switch.php
+++ b/includes/lib_switch.php
@@ -1666,7 +1666,7 @@ function save_extension_xml() {
 					$extension = preg_replace("/[\*\:\\/\<\>\|\'\"\?]/", "", $extension);
 					$dial_string = $row['dial_string'];
 					if (strlen($dial_string) == 0) {
-						$dial_string = "{sip_invite_domain=\${domain_name},presence_id=\${dialed_user}@\${dialed_domain}}\${sofia_contact(\${dialed_user}@\${dialed_domain})}";
+						$dial_string = "{sip_invite_domain=\${domain_name},presence_id=\${dialed_user}@\${dialed_domain}}\${sofia_contact(*/\${dialed_user}@\${dialed_domain})}";
 					}
 
 					$xml .= "<include>\n";