diff --git a/conf/dialplan/public.xml b/conf/dialplan/public.xml
index 08a218466b..99132ddf34 100644
--- a/conf/dialplan/public.xml
+++ b/conf/dialplan/public.xml
@@ -9,6 +9,22 @@
       </condition>
     </extension>
 
+    <!-- Try to get target_domain from the sip_req_params variable -->
+    <extension name="set_domain" continue="true">
+      <condition field="${target_domain}" expression="^$" break="never"/>
+      <condition field="source" expression="mod_sofia" break="never"/>
+      <condition field="${sip_req_params}" expression="target_domain=([A-Z-a-z0-9.]+)" break="never">
+	<action application="set" data="target_domain=$1"/>
+	<anti-action application="set" data="target_domain=$${domain}"/>
+      </condition>
+    </extension>
+
+    <extension name="call_debug">
+      <condition field="${call_debug}" expression="^true$" break="never">
+	<action application="info"/>
+      </condition>
+    </extension>
+
     <extension name="public_extensions">
       <condition field="destination_number" expression="^(10[01][0-9])$">
 	<action application="transfer" data="$1 XML default"/>
diff --git a/conf/directory/default/asterlink.com.noload b/conf/directory/default/asterlink.com.noload
index 03c9ad0601..2f187720ed 100644
--- a/conf/directory/default/asterlink.com.noload
+++ b/conf/directory/default/asterlink.com.noload
@@ -10,7 +10,8 @@
 	<param name="from-domain" value="asterlink.com"/>
 	<param name="expire-seconds" value="600"/>
 	<param name="register" value="true"/>
-	<param name="retry_seconds" value="30"/>
+	<param name="retry-seconds" value="30"/>
+	<param name="contact-params" value="target_domain=$${domain}"/>
 	<param name="extension" value="%ALEXTENSION%"/>
 	<param name="context" value="public"/>
       </gateway>
diff --git a/conf/directory/default/ideasip.com.noload b/conf/directory/default/ideasip.com.noload
index a8095a1a2e..308d96ee2c 100644
--- a/conf/directory/default/ideasip.com.noload
+++ b/conf/directory/default/ideasip.com.noload
@@ -8,7 +8,7 @@
 	<param name="password" value="%ISPASSWORD%"/>
 	<param name="expire-seconds" value="600"/>
 	<param name="register" value="true"/>
-	<param name="retry_seconds" value="30"/>
+	<param name="retry-seconds" value="30"/>
 	<param name="extension" value="%ISEXTENSION%"/>
 	<param name="context" value="public"/>
       </gateway>
diff --git a/conf/directory/default/intelefone.net.noload b/conf/directory/default/intelefone.net.noload
index a632e75f0b..2cf68055b1 100644
--- a/conf/directory/default/intelefone.net.noload
+++ b/conf/directory/default/intelefone.net.noload
@@ -12,7 +12,7 @@
 	<param name="register" value="true"/>
 	<param name="proxy" value="sip.intelefone.net"/>
 	<param name="register-proxy" value="sip.intelefone.net"/>
-	<param name="retry_seconds" value="30"/>
+	<param name="retry-seconds" value="30"/>
 	<param name="extension" value="%%USERNAME%%"/>
 	<param name="context" value="public"/>
       </gateway>
diff --git a/conf/directory/default/pulver.com.noload b/conf/directory/default/pulver.com.noload
index a66eb57768..2751b7cb1f 100644
--- a/conf/directory/default/pulver.com.noload
+++ b/conf/directory/default/pulver.com.noload
@@ -8,7 +8,7 @@
 	<param name="password" value="%FWDPASSWORD%"/>
 	<param name="expire-seconds" value="600"/>
 	<param name="register" value="true"/>
-	<param name="retry_seconds" value="30"/>
+	<param name="retry-seconds" value="30"/>
 	<param name="extension" value="%FWDEXTENSION%"/>
 	<param name="context" value="public"/>
       </gateway>
diff --git a/conf/directory/default/sip.broadvoice.com.noload b/conf/directory/default/sip.broadvoice.com.noload
index dd75257a5a..4820a3328f 100644
--- a/conf/directory/default/sip.broadvoice.com.noload
+++ b/conf/directory/default/sip.broadvoice.com.noload
@@ -21,7 +21,7 @@
 	  <!--/// register ///-->
 	  <param name="register" value="true"/>
 	  <!--How many seconds before a retry when a failure or timeout occurs -->
-	  <param name="retry_seconds" value="3600"/>
+	  <param name="retry-seconds" value="3600"/>
 	  <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
 	  <!--<param name="caller-id-in-from" value="false"/>-->
 	</gateway>
diff --git a/conf/directory/default/sipphone.com.noload b/conf/directory/default/sipphone.com.noload
index 64363420a9..46f633cb2e 100644
--- a/conf/directory/default/sipphone.com.noload
+++ b/conf/directory/default/sipphone.com.noload
@@ -8,7 +8,7 @@
 	<param name="password" value="%SPPASSWORD%"/>
 	<param name="expire-seconds" value="600"/>
 	<param name="register" value="true"/>
-	<param name="retry_seconds" value="5"/>
+	<param name="retry-seconds" value="5"/>
 	<param name="extension" value="%SPEXTENSION%"/>
 	<param name="context" value="public"/>
       </gateway>
diff --git a/conf/directory/default/voipuser.org.noload b/conf/directory/default/voipuser.org.noload
index c616384f95..60bd4ff876 100644
--- a/conf/directory/default/voipuser.org.noload
+++ b/conf/directory/default/voipuser.org.noload
@@ -8,7 +8,7 @@
 	<param name="password" value="%VUPASSWORD%"/>
 	<param name="expire-seconds" value="600"/>
 	<param name="register" value="true"/>
-	<param name="retry_seconds" value="30"/>
+	<param name="retry-seconds" value="30"/>
 	<param name="extension" value="%VUEXTENSION%"/>
 	<param name="context" value="public"/>
       </gateway>