diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index f8c827dd52..e7791135d4 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -105,7 +105,7 @@
 	<anti-action application="set" data="continue_on_fail=true"/>
 	<anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/>
 	<anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/>
-	<anti-action application="bridge" data="sofia/$${domain}/${dialed_ext}"/>
+	<anti-action application="bridge" data="USER/${dialed_ext}@$${domain}"/>
 	<anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/>
       </condition>
     </extension>
diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index cd1f122424..96e1737a5f 100644
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -1,6 +1,10 @@
 <include>
   <!--the domain or ip (the right hand side of the @ in the addr-->
   <domain name="$${domain}">
+    <params>
+      <param name="dial-string" value="sofia/${dialed_domain}/${dialed_user}"/>
+    </params>
+
     <X-PRE-PROCESS cmd="include" data="default/*.xml"/>
   </domain>
 </include>
diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index 5ada6c4373..05f35e5962 100644
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -5,7 +5,6 @@
       <param name="vm-password" value="1234"/>
       <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
       <!--<param name="vm-email-all-messages" value="true"/>-->
-      <param name="dial-string" value="sofia/${use_profile}/888@conference.freeswitch.org"/>
     </params>
     <variables>
       <variable name="user_context" value="default"/>