diff --git a/asterisk/conf/mobile/pjsip_users.conf b/asterisk/conf/mobile/pjsip_users.conf
index abfba9c..c3d7692 100644
--- a/asterisk/conf/mobile/pjsip_users.conf
+++ b/asterisk/conf/mobile/pjsip_users.conf
@@ -1,12 +1,12 @@
 ;
 ; /etc/asterisk/pjsip_users.conf
 ;
-[1000](ext-defaults)
+[1000](extension-defaults)
 
-; Yay templates; we generally only need to provide an inbound user/pass
-; and a caller id.
 inbound_auth/username=1000
 
 inbound_auth/password=MapleCarrotBlueGrainFishSoapSoup
 
 endpoint/callerid=1000 <Ext 1000>
+
+endpoint/context=from-ext
diff --git a/asterisk/conf/mobile/pjsip_wizard.conf b/asterisk/conf/mobile/pjsip_wizard.conf
index 0493ec9..d66823a 100644
--- a/asterisk/conf/mobile/pjsip_wizard.conf
+++ b/asterisk/conf/mobile/pjsip_wizard.conf
@@ -1,7 +1,7 @@
 ;
 ; /etc/asterisk/pjsip_wizard.conf
 ;
-[ext-defaults](!)
+[extension-defaults](!)
 type=wizard
 
 ; Users must register and auth!
@@ -20,9 +20,6 @@ aor/remove_existing=yes
 ; Max simultaneous account logins.
 endpoint/max_contacts=1
 
-; Default context.
-endpoint/context=from-ext
-
 ; Audio codecs: alaw only please.
 endpoint/allow=!all,alaw
 
@@ -35,5 +32,6 @@ endpoint/direct_media=no
 ; Busy Lamp field / Presence context.
 endpoint/subscribe_context=presence
 
-; Load users.
+;
+; Load user extensions. 
 #tryinclude pjsip_users.conf