diff --git a/conf/autoload_configs/enum.conf.xml b/conf/autoload_configs/enum.conf.xml
index 664c9e5a6c..3011bcdceb 100644
--- a/conf/autoload_configs/enum.conf.xml
+++ b/conf/autoload_configs/enum.conf.xml
@@ -6,7 +6,7 @@
   </settings>
 
   <routes>
-    <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/$${sip_profile}/$1"/>
+    <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/${use_profile}/$1"/>
     <route service="E2U+IAX2" regex="iax2:(.*)" replace="iax/$1"/>
     <route service="E2U+XMPP" regex="XMPP:(.*)" replace="dingaling/$${xmpp_server_profile}/$1"/>
   </routes>
diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index e0966e1d75..fa7df160c8 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -183,7 +183,7 @@
 	<action application="fifo" data="default out nowait"/>
       </condition>
     </extension> 
-    
+    <!--
     <extension name="Localized_Dialplan">
       <condition field="${numbering_plan}" expression="^[[:alnum:]]+$"/>
       <condition field="${default_gateway}" expression="[[:alnum:]]"/>
@@ -191,19 +191,15 @@
 	<action application="transfer" data="$1 XML ${numbering_plan}-Numbering-Plan"/>
       </condition>
     </extension>
-
-
-    <!-- 
-	 this is a "catchall" extension that will match anything that's 
-	 unmatched thus far.... uncomment and reloadxml to activate it
-    -->
-    <!--
-	<extension name="catchall">
-	<condition>
-	<action application="set" data="effective_caller_id_name=another noob"/>
-	<action application="bridge" data="sofia/$${domain}/888@conference.freeswitch.org"/>
-	</condition>
-	</extension>
     -->
+
+    <!-- Catchall ENUM -->
+    <extension name="enum">
+      <condition field="destination_number" expression="^(.*)$">
+	<action application="enum" data="$1"/>
+	<action application="bridge" data="${enum_auto_route}"/>
+      </condition>
+    </extension>
+    
   </context>
 </include>