diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 10fd624d3c..46b112ab64 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -24,15 +24,16 @@
     </extension>
 
     <extension name="global" continue="true">
-      <condition field="${network_addr}" expression="false" break="never">
+      <condition field="${network_addr}" expression="^$" break="never">
 	<action application="set" data="use_profile=${cond(${is_lan_addr($${local_ip_v4})} == yes ? nat : default)}"/>
 	<anti-action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/>
       </condition>
       <!-- This will setup some variables if the user isn't authenticated.
 	   numbering_plan is required for the demo to function properly. 
       -->
-      <condition field="${numbering_plan}" expression="false" break="never">
+      <condition field="${numbering_plan}" expression="^$" break="never">
 	<action application="set_user" data="default@${domain}"/>
+	<anti-action application="set" data="blank_numbering_plan=NO"/> 
       </condition>
       <condition>
 	<action application="info"/>