diff --git a/conf/autoload_configs/dingaling.conf.xml b/conf/autoload_configs/dingaling.conf.xml
index b7b0ae0fc5..6b155bbfbf 100644
--- a/conf/autoload_configs/dingaling.conf.xml
+++ b/conf/autoload_configs/dingaling.conf.xml
@@ -12,6 +12,7 @@
     <param name="login" value="myjid@myserver.com/talk"/>
     <param name="password" value="mypass"/>
     <param name="dialplan" value="XML"/>
+    <param name="context" value="public"/>
     <param name="message" value="Jingle all the way"/>
     <param name="rtp-ip" value="$${bind_server_ip}"/>
     <!-- <param name="ext-rtp-ip" value="$${external_rtp_ip"/> -->
@@ -38,6 +39,7 @@
     <param name="name" value="$${xmpp_server_profile}"/>
     <param name="password" value="secret"/>
     <param name="dialplan" value="XML"/>
+    <param name="context" value="public"/>
     <param name="rtp-ip" value="$${bind_server_ip}"/>
     <param name="server" value="jabber.server.org:5347"/>
     <!-- disable to trade async for more calls -->
diff --git a/conf/autoload_configs/iax.conf.xml b/conf/autoload_configs/iax.conf.xml
index 345f7f4fa2..f050bea4c1 100644
--- a/conf/autoload_configs/iax.conf.xml
+++ b/conf/autoload_configs/iax.conf.xml
@@ -3,6 +3,7 @@
     <param name="debug" value="0"/>
     <param name="ip" value="$${local_ip_v4}"/>
     <param name="port" value="4569"/>
+    <param name="context" value="public"/>
     <param name="dialplan" value="XML"/>
     <param name="codec-prefs" value="PCMU@20i,PCMA,speex,L16"/>
     <param name="codec-master" value="us"/>
diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index cec9c1ae54..e0966e1d75 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -1,207 +1,209 @@
-<context name="default">
-  <extension name="intercept">
-    <condition field="destination_number" expression="^886$">
-      <action application="answer"/>
-      <action application="intercept" data="${db(select/last_dial/global)}"/>
-      <action application="sleep" data="2000"/>
-    </condition>
-  </extension>
+<include>
+  <context name="default">
+    <extension name="intercept">
+      <condition field="destination_number" expression="^886$">
+	<action application="answer"/>
+	<action application="intercept" data="${db(select/last_dial/global)}"/>
+	<action application="sleep" data="2000"/>
+      </condition>
+    </extension>
 
-  <extension name="intercept-ext">
-    <condition field="destination_number" expression="^886(\d+)$">
-      <action application="answer"/>
-      <action application="intercept" data="${db(select/last_dial_ext/$1)}"/>
-      <action application="sleep" data="2000"/>
-    </condition>
-  </extension>
+    <extension name="intercept-ext">
+      <condition field="destination_number" expression="^886(\d+)$">
+	<action application="answer"/>
+	<action application="intercept" data="${db(select/last_dial_ext/$1)}"/>
+	<action application="sleep" data="2000"/>
+      </condition>
+    </extension>
 
-  <extension name="redial">
-    <condition field="destination_number" expression="^870$">
-      <action application="transfer" data="${db(select/last_dial/${caller_id_number})}"/>
-    </condition>
-  </extension>
+    <extension name="redial">
+      <condition field="destination_number" expression="^870$">
+	<action application="transfer" data="${db(select/last_dial/${caller_id_number})}"/>
+      </condition>
+    </extension>
 
-  <extension name="global" continue="true">
-    <condition field="${network_addr}" condition="^$">
-      <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. 
+    <extension name="global" continue="true">
+      <condition field="${network_addr}" condition="^$">
+	<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}" condition="^1$">
-      <action application="set_user" data="default@${domain}"/>
-    </condition>
-    <condition>
-      <action application="info"/>
-      <action application="db" data="insert/spymap/${caller_id_number}/${uuid}"/>
-      <action application="db" data="insert/last_dial/${caller_id_number}/${destination_number}"/>
-      <action application="db" data="insert/last_dial/global/${uuid}"/>
-    </condition>
-  </extension>
+      <condition field="${numbering_plan}" condition="^1$">
+	<action application="set_user" data="default@${domain}"/>
+      </condition>
+      <condition>
+	<action application="info"/>
+	<action application="db" data="insert/spymap/${caller_id_number}/${uuid}"/>
+	<action application="db" data="insert/last_dial/${caller_id_number}/${destination_number}"/>
+	<action application="db" data="insert/last_dial/global/${uuid}"/>
+      </condition>
+    </extension>
 
 
-  <extension name="eavesdrop">
-    <condition field="destination_number" expression="^88(.*)$|^*0(.*)$">
-      <action application="answer"/>
-      <action application="eavesdrop" data="${db(select/spymap/$1)}"/>
-    </condition>
-  </extension>
+    <extension name="eavesdrop">
+      <condition field="destination_number" expression="^88(.*)$|^*0(.*)$">
+	<action application="answer"/>
+	<action application="eavesdrop" data="${db(select/spymap/$1)}"/>
+      </condition>
+    </extension>
 
-  <extension name="star-69">
-    <condition field="destination_number" expression="^\*69$|^869$">
-      <action application="transfer" data="${db(select/call_return/${caller_id_number})}"/>
-    </condition>
-  </extension>
+    <extension name="star-69">
+      <condition field="destination_number" expression="^\*69$|^869$">
+	<action application="transfer" data="${db(select/call_return/${caller_id_number})}"/>
+      </condition>
+    </extension>
 
-  <extension name="add-group">
-    <condition field="destination_number" expression="^81(\d{2})$">
-      <action application="answer"/>
-      <action application="group" data="insert:$1:${sofia_contact(${sip_from_user}@${domain})}"/>
-      <action application="gentones" data="%(1000, 0, 640)"/>
-    </condition>
-  </extension>
+    <extension name="add-group">
+      <condition field="destination_number" expression="^81(\d{2})$">
+	<action application="answer"/>
+	<action application="group" data="insert:$1:${sofia_contact(${sip_from_user}@${domain})}"/>
+	<action application="gentones" data="%(1000, 0, 640)"/>
+      </condition>
+    </extension>
 
-  <extension name="del-group">
-    <condition field="destination_number" expression="^80(\d{2})$">
-      <action application="answer"/>
-      <action application="group" data="delete:$1:${sofia_contact(${sip_from_user}@${domain})}"/>
-      <action application="gentones" data="%(1000, 0, 320)"/>
-    </condition>
-  </extension>
+    <extension name="del-group">
+      <condition field="destination_number" expression="^80(\d{2})$">
+	<action application="answer"/>
+	<action application="group" data="delete:$1:${sofia_contact(${sip_from_user}@${domain})}"/>
+	<action application="gentones" data="%(1000, 0, 320)"/>
+      </condition>
+    </extension>
 
-  <extension name="call-group-simo">
-    <condition field="destination_number" expression="^82(\d{2})$">
-      <action application="bridge" data="${group(call:$1)}"/>
-    </condition>
-  </extension>
+    <extension name="call-group-simo">
+      <condition field="destination_number" expression="^82(\d{2})$">
+	<action application="bridge" data="${group(call:$1)}"/>
+      </condition>
+    </extension>
 
-  <extension name="call-group-order">
-    <condition field="destination_number" expression="^83(\d{2})$">
-      <action application="set" data="call_timeout=10"/>
-      <action application="bridge" data="${group(call:$1:order)}"/>
-    </condition>
-  </extension>
+    <extension name="call-group-order">
+      <condition field="destination_number" expression="^83(\d{2})$">
+	<action application="set" data="call_timeout=10"/>
+	<action application="bridge" data="${group(call:$1:order)}"/>
+      </condition>
+    </extension>
 
 
-  <!-- 
-  if the calling party is the called party, go to their VM
-  if the calling party is NOT the called party dial the extension 
-  (1000-1019) for 30 seconds and go to voicemail if the 
-  call fails (continue_on_fail=true), otherwise hang up after a 
-  successful bridge (hangup_after-bridge=true) 
-  -->
-  <extension name="Local_Extension">
-    <condition field="destination_number" expression="^(10[01][0-9])$" continue="on-true">
-      <action application="set" data="dialed_ext=$1"/>
-    </condition>
-    <condition field="destination_number" expression="^${caller_id_number}$">
-      <action application="set" data="voicemail_authorized=${sip_authorized}"/>
-      <action application="voicemail" data="check default $${domain} ${dialed_ext}"/>
-      <anti-action application="set" data="call_timeout=30000"/>
-      <anti-action application="set" data="hangup_after_bridge=true"/>
-      <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="voicemail" data="default $${domain} ${dialed_ext}"/>
-    </condition>
-  </extension>
+    <!-- 
+	 if the calling party is the called party, go to their VM
+	 if the calling party is NOT the called party dial the extension 
+	 (1000-1019) for 30 seconds and go to voicemail if the 
+	 call fails (continue_on_fail=true), otherwise hang up after a 
+	 successful bridge (hangup_after-bridge=true) 
+    -->
+    <extension name="Local_Extension">
+      <condition field="destination_number" expression="^(10[01][0-9])$" continue="on-true">
+	<action application="set" data="dialed_ext=$1"/>
+      </condition>
+      <condition field="destination_number" expression="^${caller_id_number}$">
+	<action application="set" data="voicemail_authorized=${sip_authorized}"/>
+	<action application="voicemail" data="check default $${domain} ${dialed_ext}"/>
+	<anti-action application="set" data="call_timeout=30000"/>
+	<anti-action application="set" data="hangup_after_bridge=true"/>
+	<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="voicemail" data="default $${domain} ${dialed_ext}"/>
+      </condition>
+    </extension>
 
-  <!-- dial via SIP uri -->
-  <extension name="SIP_URI">
-    <condition field="destination_number" expression="^sip:(.*)$">
-      <action application="bridge" data="sofia/${use_profile}/$1"/>
-    </condition>
-  </extension>
+    <!-- dial via SIP uri -->
+    <extension name="SIP_URI">
+      <condition field="destination_number" expression="^sip:(.*)$">
+	<action application="bridge" data="sofia/${use_profile}/$1"/>
+      </condition>
+    </extension>
 
-  <!--
-  start a dynamic conference with the settings of the 
-  "default" conference profile in conference.conf.xml
-  -->                                                                                                                                                       
-  <extension name="Conferences">                                                                                                                           
-    <condition field="destination_number" expression="^(3\d{3})$">                                                                                             
-      <action application="conference" data="$1@default"/>                                                                                                     
-    </condition>                                                                                                                                               
-  </extension>           
- 
-  <!-- dial the freeswitch conference via SIP-->
-  <extension name="FS_Conf_SIP">
-    <condition field="destination_number" expression="^888$">
-      <action application="bridge" data="sofia/${use_profile}/888@conference.freeswitch.org"/>
-    </condition>
-  </extension>
+    <!--
+	start a dynamic conference with the settings of the 
+	"default" conference profile in conference.conf.xml
+    -->                                                                                                                                                       
+    <extension name="Conferences">                                                                                                                           
+      <condition field="destination_number" expression="^(3\d{3})$">                                                                                             
+	<action application="conference" data="$1@default"/>                                                                                                     
+      </condition>                                                                                                                                               
+    </extension>           
+    
+    <!-- dial the freeswitch conference via SIP-->
+    <extension name="FS_Conf_SIP">
+      <condition field="destination_number" expression="^888$">
+	<action application="bridge" data="sofia/${use_profile}/888@conference.freeswitch.org"/>
+      </condition>
+    </extension>
 
-  <extension name="static-park">
-    <condition field="destination_number" expression="^8192$">
-      <action application="fifo" data="default in undef /ram/swimp.raw"/>
-    </condition>
-  </extension>
-  
-  <extension name="unpark">
-    <condition field="destination_number" expression="^8193$">
-      <action application="answer"/>
-      <action application="fifo" data="default out nowait"/>
-    </condition>
-  </extension>
-  
-  <!--
-  if the number starts with a *393 then strip the *393 
-  and dial the remainder of the number out our "fwd" gateway
-  -->
-  <extension name="FWD">
-    <condition field="destination_number" expression="^\*393([\*\d]+)$">
-    <!-- Just incase they are using Asterisk let's disable VAD and only use G.711 -->
-      <action application="export" data="rtp_disable_vad_out=true"/>
-      <action application="export" data="absolute_codec_string=PCMU@20i,PCMA@20i"/>
-      <action application="bridge" data="sofia/gateway/fwd/$1"/>
-    </condition>
-  </extension> 
- 
-  <!-- a sample IVR  -->
-  <extension name="IVR_Demo">
-    <condition field="destination_number" expression="5000">
-      <action application="ivr" data="demo"/>
-    </condition>
-  </extension>
- 
- 
-  <!-- 
-  Parking extensions... transferring calls to 5900 will park them in a 
-  queue. dialing 5901 will let you pull them out of the queue.
-  -->
-  <extension name="park">
-    <condition field="destination_number" expression="^5900$">
-      <action application="fifo" data="default in undef soundfiles/swimp.raw"/>
-    </condition>
-  </extension>
- 
-  <extension name="unpark">
-    <condition field="destination_number" expression="^5901$">
-      <action application="answer"/>
-      <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:]]"/>
-    <condition field="destination_number" expression="^([[:alnum:]]+)$">
-      <action application="transfer" data="$1 XML ${numbering_plan}-Numbering-Plan"/>
-    </condition>
-  </extension>
+    <extension name="static-park">
+      <condition field="destination_number" expression="^8192$">
+	<action application="fifo" data="default in undef /ram/swimp.raw"/>
+      </condition>
+    </extension>
+    
+    <extension name="unpark">
+      <condition field="destination_number" expression="^8193$">
+	<action application="answer"/>
+	<action application="fifo" data="default out nowait"/>
+      </condition>
+    </extension>
+    
+    <!--
+	if the number starts with a *393 then strip the *393 
+	and dial the remainder of the number out our "fwd" gateway
+    -->
+    <extension name="FWD">
+      <condition field="destination_number" expression="^\*393([\*\d]+)$">
+	<!-- Just incase they are using Asterisk let's disable VAD and only use G.711 -->
+	<action application="export" data="rtp_disable_vad_out=true"/>
+	<action application="export" data="absolute_codec_string=PCMU@20i,PCMA@20i"/>
+	<action application="bridge" data="sofia/gateway/fwd/$1"/>
+      </condition>
+    </extension> 
+    
+    <!-- a sample IVR  -->
+    <extension name="IVR_Demo">
+      <condition field="destination_number" expression="5000">
+	<action application="ivr" data="demo"/>
+      </condition>
+    </extension>
+    
+    
+    <!-- 
+	 Parking extensions... transferring calls to 5900 will park them in a 
+	 queue. dialing 5901 will let you pull them out of the queue.
+    -->
+    <extension name="park">
+      <condition field="destination_number" expression="^5900$">
+	<action application="fifo" data="default in undef soundfiles/swimp.raw"/>
+      </condition>
+    </extension>
+    
+    <extension name="unpark">
+      <condition field="destination_number" expression="^5901$">
+	<action application="answer"/>
+	<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:]]"/>
+      <condition field="destination_number" expression="^([[:alnum:]]+)$">
+	<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>
-  -->
-</context>
+    <!-- 
+	 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>
+    -->
+  </context>
+</include>
diff --git a/conf/dialplan/public.xml b/conf/dialplan/public.xml
new file mode 100644
index 0000000000..81732c90b9
--- /dev/null
+++ b/conf/dialplan/public.xml
@@ -0,0 +1,22 @@
+<include>
+  <context name="public">
+    <extension name="blah">
+      <condition>
+	<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"/>
+      </condition>
+    </extension>
+
+    <extension name="public_did">
+      <condition field="destination_number" expression="^(5551212)$">
+	<action application="transfer" data="$1 XML default"/>
+      </condition>
+    </extension>
+
+  </context>
+</include>
diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index dbe87d40af..24153b03a3 100644
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -7,5 +7,8 @@
       <!--<param name="vm-email-all-messages" value="true"/>-->
       <param name="dial-string" value="sofia/${use_profile}/888@conference.freeswitch.org"/>
     </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1001.xml b/conf/directory/default/1001.xml
index 0eb0e2f936..317a92536e 100644
--- a/conf/directory/default/1001.xml
+++ b/conf/directory/default/1001.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1001"/>
+  <user id="1001" mailbox="1001">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1002.xml b/conf/directory/default/1002.xml
index dfaa712d7a..36d0222181 100644
--- a/conf/directory/default/1002.xml
+++ b/conf/directory/default/1002.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1002"/>
+  <user id="1002" mailbox="1002">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1003.xml b/conf/directory/default/1003.xml
index 62d3d2b8f4..d7241a24b0 100644
--- a/conf/directory/default/1003.xml
+++ b/conf/directory/default/1003.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1003"/>
+  <user id="1003" mailbox="1003">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1004.xml b/conf/directory/default/1004.xml
index de0db09690..5e956441c6 100644
--- a/conf/directory/default/1004.xml
+++ b/conf/directory/default/1004.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1004"/>
+  <user id="1004" mailbox="1004">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1005.xml b/conf/directory/default/1005.xml
index e63f630d9b..f87bace384 100644
--- a/conf/directory/default/1005.xml
+++ b/conf/directory/default/1005.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1005"/>
+  <user id="1005" mailbox="1005">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1006.xml b/conf/directory/default/1006.xml
index 860fca4093..696a07d872 100644
--- a/conf/directory/default/1006.xml
+++ b/conf/directory/default/1006.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1006"/>
+  <user id="1006" mailbox="1006">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1007.xml b/conf/directory/default/1007.xml
index 7b0baedfe8..a5d7db5ef4 100644
--- a/conf/directory/default/1007.xml
+++ b/conf/directory/default/1007.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1007"/>
+  <user id="1007" mailbox="1007">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1008.xml b/conf/directory/default/1008.xml
index d9167fa65d..9fb2b7f34d 100644
--- a/conf/directory/default/1008.xml
+++ b/conf/directory/default/1008.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1008"/>
+  <user id="1008" mailbox="1008">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1009.xml b/conf/directory/default/1009.xml
index cf8d7a890a..a891f348ac 100644
--- a/conf/directory/default/1009.xml
+++ b/conf/directory/default/1009.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1009"/>
+  <user id="1009" mailbox="1009">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1010.xml b/conf/directory/default/1010.xml
index 6108ea47ca..65e9773d25 100644
--- a/conf/directory/default/1010.xml
+++ b/conf/directory/default/1010.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1010"/>
+  <user id="1010" mailbox="1010">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1011.xml b/conf/directory/default/1011.xml
index 0e46facfda..f0337c695f 100644
--- a/conf/directory/default/1011.xml
+++ b/conf/directory/default/1011.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1011"/>
+  <user id="1011" mailbox="1011">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1012.xml b/conf/directory/default/1012.xml
index 5264e3d1cd..1452e67987 100644
--- a/conf/directory/default/1012.xml
+++ b/conf/directory/default/1012.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1012"/>
+  <user id="1012" mailbox="1012">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1013.xml b/conf/directory/default/1013.xml
index f1c7c87d3e..e8a3415405 100644
--- a/conf/directory/default/1013.xml
+++ b/conf/directory/default/1013.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1013"/>
+  <user id="1013" mailbox="1013">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1014.xml b/conf/directory/default/1014.xml
index b596545166..0fa90c446f 100644
--- a/conf/directory/default/1014.xml
+++ b/conf/directory/default/1014.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1014"/>
+  <user id="1014" mailbox="1014">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1015.xml b/conf/directory/default/1015.xml
index 2045720e99..cc32d031b3 100644
--- a/conf/directory/default/1015.xml
+++ b/conf/directory/default/1015.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1015"/>
+  <user id="1015" mailbox="1015">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1016.xml b/conf/directory/default/1016.xml
index a7221a94bb..3e3a97c63a 100644
--- a/conf/directory/default/1016.xml
+++ b/conf/directory/default/1016.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1016"/>
+  <user id="1016" mailbox="1016">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1017.xml b/conf/directory/default/1017.xml
index 9ce4e7c5eb..9dc72f38e5 100644
--- a/conf/directory/default/1017.xml
+++ b/conf/directory/default/1017.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1017"/>
+  <user id="1017" mailbox="1017">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1018.xml b/conf/directory/default/1018.xml
index b9dc231269..66e1a55b24 100644
--- a/conf/directory/default/1018.xml
+++ b/conf/directory/default/1018.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1018"/>
+  <user id="1018" mailbox="1018">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/1019.xml b/conf/directory/default/1019.xml
index 2c97b0c345..399d3173a1 100644
--- a/conf/directory/default/1019.xml
+++ b/conf/directory/default/1019.xml
@@ -1,3 +1,10 @@
 <include>
-	<user id="1019"/>
+  <user id="1019" mailbox="1019">
+    <params>
+      <param name="password" value="1234"/>
+    </params>
+    <variables>
+      <variable name="inbound_context" value="default"/>
+    </variables>
+  </user>
 </include>
diff --git a/conf/directory/default/brian.xml b/conf/directory/default/brian.xml
index 8af847858b..09676d78f9 100644
--- a/conf/directory/default/brian.xml
+++ b/conf/directory/default/brian.xml
@@ -49,7 +49,7 @@
     </params>
     <variables>
       <!--all variables here will be set on all inbound calls that originate from this user -->
-      <variable name="testing" value="this"/>
+      <variable name="inbound_context" value="default"/>
 
       <!-- limit the max number of outgoing calls for this user -->
       <!--<variable name="max_calls" value="2"/>-->
diff --git a/conf/sip_profiles/default.xml b/conf/sip_profiles/default.xml
index 42fea84774..b76bb63a81 100644
--- a/conf/sip_profiles/default.xml
+++ b/conf/sip_profiles/default.xml
@@ -46,6 +46,7 @@
   
   <settings>
     <param name="debug" value="1"/>
+    <param name="context" value="public"/>
     <param name="rfc2833-pt" value="101"/>
     <param name="sip-port" value="5060"/>
     <param name="dialplan" value="XML,enum"/>
diff --git a/conf/sip_profiles/nat.xml b/conf/sip_profiles/nat.xml
index a38dc07020..5f2d3b8753 100644
--- a/conf/sip_profiles/nat.xml
+++ b/conf/sip_profiles/nat.xml
@@ -4,6 +4,7 @@
     <param name="rfc2833-pt" value="101"/>
     <param name="sip-port" value="5070"/>
     <param name="dialplan" value="XML,enum"/>
+    <param name="context" value="public"/>
     <param name="dtmf-duration" value="100"/>
     <param name="codec-prefs" value="$${global_codec_prefs}"/>
     <param name="use-rtp-timer" value="true"/>