diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 5571dd1c53..5c8e615007 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -91,7 +91,7 @@
 	<action application="set" data="sip_h_Call-Info=<sip:$${local_ip_v4}>;answer-after=0"/>
 	<action application="set" data="sip_auto_answer=true"/>
 	<action application="set" data="export_vars=sip_h_Call-Info,sip_auto_answer"/>
-	<action application="bridge" data="USER/${dialed_ext}@$${domain}"/>
+	<action application="bridge" data="user/${dialed_ext}@$${domain}"/>
       </condition>
     </extension>
 
@@ -111,14 +111,14 @@
 	<action application="answer"/>
 	<action application="sleep" data="1000"/>
 	<action application="voicemail" data="check default $${domain} ${dialed_ext}"/>
-	<anti-action application="ring_ready"/>
-	<anti-action application="set" data="call_timeout=130"/>
+	<anti-action application="set" data="transfer_ringback=${us-ring}"/>
+	<anti-action application="set" data="call_timeout=30"/>
 	<anti-action application="set" data="hangup_after_bridge=true"/>
 	<anti-action application="set" data="left_hanging_extension=5900"/>
 	<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="{left_hanging_extension=5900,transfer_fallback_extension=${dialed_ext}}USER/${dialed_ext}@$${domain}"/>
+	<anti-action application="bridge" data="user/${dialed_ext}@$${domain}"/>
 	<anti-action application="answer"/>
 	<anti-action application="sleep" data="1000"/>
 	<anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/>
diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index 96e1737a5f..e01b4da5e6 100644
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -2,7 +2,7 @@
   <!--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}"/>
+      <param name="dial-string" value="{left_hanging_extension=5900,transfer_fallback_extension=${dialed_user}}sofia/${dialed_domain}/${dialed_user}"/>
     </params>
 
     <X-PRE-PROCESS cmd="include" data="default/*.xml"/>