diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index 2f386a2523..fc19f4a242 100644
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -26,8 +26,8 @@
 
     <variables>
       <variable name="record_stereo" value="true"/>
-      <variable name="default_gateway" value="asterlink.com"/>
-      <variable name="default_areacode" value="918"/>
+      <variable name="default_gateway" value="$${default_provider}"/>
+      <variable name="default_areacode" value="$${default_areacode}"/>
     </variables>
 
     <X-PRE-PROCESS cmd="include" data="default/*.xml"/>
diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index bbbb422df6..868be9e513 100644
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1000"/>
       <variable name="effective_caller_id_number" value="1000"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1001.xml b/conf/directory/default/1001.xml
index cc7762c8ed..ff2287a71e 100644
--- a/conf/directory/default/1001.xml
+++ b/conf/directory/default/1001.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1001"/>
       <variable name="effective_caller_id_number" value="1001"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1002.xml b/conf/directory/default/1002.xml
index a6a7c19f25..d6ccc63ec7 100644
--- a/conf/directory/default/1002.xml
+++ b/conf/directory/default/1002.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1002"/>
       <variable name="effective_caller_id_number" value="1002"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1003.xml b/conf/directory/default/1003.xml
index 501db5e095..3ef39c8f57 100644
--- a/conf/directory/default/1003.xml
+++ b/conf/directory/default/1003.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1003"/>
       <variable name="effective_caller_id_number" value="1003"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1004.xml b/conf/directory/default/1004.xml
index 5eff8520ce..8db784199f 100644
--- a/conf/directory/default/1004.xml
+++ b/conf/directory/default/1004.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1004"/>
       <variable name="effective_caller_id_number" value="1004"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1005.xml b/conf/directory/default/1005.xml
index 04ed28e06e..6711745321 100644
--- a/conf/directory/default/1005.xml
+++ b/conf/directory/default/1005.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1005"/>
       <variable name="effective_caller_id_number" value="1005"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1006.xml b/conf/directory/default/1006.xml
index 86306dc728..2a5f63a506 100644
--- a/conf/directory/default/1006.xml
+++ b/conf/directory/default/1006.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1006"/>
       <variable name="effective_caller_id_number" value="1006"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1007.xml b/conf/directory/default/1007.xml
index 70d6529b55..d941c543a3 100644
--- a/conf/directory/default/1007.xml
+++ b/conf/directory/default/1007.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1007"/>
       <variable name="effective_caller_id_number" value="1007"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1008.xml b/conf/directory/default/1008.xml
index 95f220eb79..86c7b91edc 100644
--- a/conf/directory/default/1008.xml
+++ b/conf/directory/default/1008.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1008"/>
       <variable name="effective_caller_id_number" value="1008"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1009.xml b/conf/directory/default/1009.xml
index f6c3167a96..cbb670e870 100644
--- a/conf/directory/default/1009.xml
+++ b/conf/directory/default/1009.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1009"/>
       <variable name="effective_caller_id_number" value="1009"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1010.xml b/conf/directory/default/1010.xml
index 4be7d5715c..ab0e65c733 100644
--- a/conf/directory/default/1010.xml
+++ b/conf/directory/default/1010.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1010"/>
       <variable name="effective_caller_id_number" value="1010"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1011.xml b/conf/directory/default/1011.xml
index ade1f149a6..ce9ac52702 100644
--- a/conf/directory/default/1011.xml
+++ b/conf/directory/default/1011.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1011"/>
       <variable name="effective_caller_id_number" value="1011"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1012.xml b/conf/directory/default/1012.xml
index bd883c5538..c080f0b5ae 100644
--- a/conf/directory/default/1012.xml
+++ b/conf/directory/default/1012.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1012"/>
       <variable name="effective_caller_id_number" value="1012"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1013.xml b/conf/directory/default/1013.xml
index f9ba0c2037..51b70283be 100644
--- a/conf/directory/default/1013.xml
+++ b/conf/directory/default/1013.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1013"/>
       <variable name="effective_caller_id_number" value="1013"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1014.xml b/conf/directory/default/1014.xml
index 5f03064566..7aed857da1 100644
--- a/conf/directory/default/1014.xml
+++ b/conf/directory/default/1014.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1014"/>
       <variable name="effective_caller_id_number" value="1014"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1015.xml b/conf/directory/default/1015.xml
index 88355e30bb..e72296fc88 100644
--- a/conf/directory/default/1015.xml
+++ b/conf/directory/default/1015.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1015"/>
       <variable name="effective_caller_id_number" value="1015"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1016.xml b/conf/directory/default/1016.xml
index dddab02e9a..5b3d8cb5fc 100644
--- a/conf/directory/default/1016.xml
+++ b/conf/directory/default/1016.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1016"/>
       <variable name="effective_caller_id_number" value="1016"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1017.xml b/conf/directory/default/1017.xml
index 9af6792407..f3bee1c7bc 100644
--- a/conf/directory/default/1017.xml
+++ b/conf/directory/default/1017.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1017"/>
       <variable name="effective_caller_id_number" value="1017"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1018.xml b/conf/directory/default/1018.xml
index 25663d43a2..c57612b1f2 100644
--- a/conf/directory/default/1018.xml
+++ b/conf/directory/default/1018.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1018"/>
       <variable name="effective_caller_id_number" value="1018"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1019.xml b/conf/directory/default/1019.xml
index 6e58114d67..5a06e33b2c 100644
--- a/conf/directory/default/1019.xml
+++ b/conf/directory/default/1019.xml
@@ -10,8 +10,8 @@
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1019"/>
       <variable name="effective_caller_id_number" value="1019"/>
-      <variable name="outbound_caller_id_name" value="Acme Corporation"/>
-      <variable name="outbound_caller_id_number" value="5552566639"/>
+      <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/provider.com.xml b/conf/directory/default/provider.com.xml
new file mode 100644
index 0000000000..23ffcfa189
--- /dev/null
+++ b/conf/directory/default/provider.com.xml
@@ -0,0 +1,26 @@
+<!--
+    Shell provider account should work with most providers.
+
+-->
+<include>
+  <user id="$${default_provider}">
+    <gateways>
+      <gateway name="$${default_provider}">
+	<param name="username" value="$${default_provider_username}"/>
+	<param name="password" value="$${default_provider_password}"/>
+	<param name="from-user" value="$${default_provider_username}"/>
+	<param name="from-domain" value="$${default_provider_from_domain}"/>
+	<param name="expire-seconds" value="600"/>
+	<param name="register" value="$${default_provider_register}"/>
+	<param name="retry-seconds" value="30"/>
+	<param name="extension" value="$${default_provider_contact}"/>
+	<param name="contact-params" value="domain_name=$${domain}"/>
+	<param name="context" value="public"/>
+      </gateway>
+    </gateways>
+    <params>
+      <param name="password" value="$${default_provider_password}"/>
+    </params>
+  </user>
+</include>
+
diff --git a/conf/vars.xml b/conf/vars.xml
index 4b3106ae8e..d2199857a0 100644
--- a/conf/vars.xml
+++ b/conf/vars.xml
@@ -95,14 +95,35 @@
   <X-PRE-PROCESS cmd="set" data="unroll_loops=true"/>
   <!-- outbound_caller_id and outbound_caller_name
        The caller ID telephone number we should use when calling out.
-       Used by: conference.conf.xml
+       Used by: conference.conf.xml and user directory for default
+       outbound callerid name and number.
   -->
   <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>
   <X-PRE-PROCESS cmd="set" data="outbound_caller_id=0000000000"/>
+
+  <!-- various debug and defaults -->
   <X-PRE-PROCESS cmd="set" data="call_debug=false"/>
   <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
+  <X-PRE-PROCESS cmd="set" data="default_areacode=918"/>
 
   <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2200,400,450)"/>
   <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/>
   <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500, 3500, 440.0, 0.0)"/>
   <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>
+  <!--
+      Setting up your default sip provider is easy.
+      Below are some values that should work in most cases.
+      
+      These are for conf/directory/default/provider.com.xml
+
+  -->
+  <X-PRE-PROCESS cmd="set" data="default_provider=provider.com"/>
+  <X-PRE-PROCESS cmd="set" data="default_provider_username=joeuser"/>
+  <X-PRE-PROCESS cmd="set" data="default_provider_password=password"/>
+  <X-PRE-PROCESS cmd="set" data="default_provider_from_domain=provider.com"/>
+  <!-- true or false -->
+  <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/>
+  <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/>
+
+  <X-PRE-PROCESS cmd="include" data="../local_vars.xml"/>
+