diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index 0f9024c297..9bee406ddf 100644
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1000" mailbox="1000">
+  <user id="1000">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1000"/>
diff --git a/conf/directory/default/1001.xml b/conf/directory/default/1001.xml
index 9b9d80852d..97c1931c51 100644
--- a/conf/directory/default/1001.xml
+++ b/conf/directory/default/1001.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1001" mailbox="1001">
+  <user id="1001">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1001"/>
diff --git a/conf/directory/default/1002.xml b/conf/directory/default/1002.xml
index 371018cee6..d33691d100 100644
--- a/conf/directory/default/1002.xml
+++ b/conf/directory/default/1002.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1002" mailbox="1002">
+  <user id="1002">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1002"/>
diff --git a/conf/directory/default/1003.xml b/conf/directory/default/1003.xml
index 2eb7e41e29..f8b5926c9d 100644
--- a/conf/directory/default/1003.xml
+++ b/conf/directory/default/1003.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1003" mailbox="1003">
+  <user id="1003">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1003"/>
diff --git a/conf/directory/default/1004.xml b/conf/directory/default/1004.xml
index 3a461ff76e..c3e7da5722 100644
--- a/conf/directory/default/1004.xml
+++ b/conf/directory/default/1004.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1004" mailbox="1004">
+  <user id="1004">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1004"/>
diff --git a/conf/directory/default/1005.xml b/conf/directory/default/1005.xml
index e2bf3524d7..0e1165f43f 100644
--- a/conf/directory/default/1005.xml
+++ b/conf/directory/default/1005.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1005" mailbox="1005">
+  <user id="1005">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1005"/>
diff --git a/conf/directory/default/1006.xml b/conf/directory/default/1006.xml
index e85f4a1945..beaaa7e9fc 100644
--- a/conf/directory/default/1006.xml
+++ b/conf/directory/default/1006.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1006" mailbox="1006">
+  <user id="1006">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1006"/>
diff --git a/conf/directory/default/1007.xml b/conf/directory/default/1007.xml
index e73658bbb6..10470a5045 100644
--- a/conf/directory/default/1007.xml
+++ b/conf/directory/default/1007.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1007" mailbox="1007">
+  <user id="1007">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1007"/>
diff --git a/conf/directory/default/1008.xml b/conf/directory/default/1008.xml
index f7fd534790..0e63fcfde0 100644
--- a/conf/directory/default/1008.xml
+++ b/conf/directory/default/1008.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1008" mailbox="1008">
+  <user id="1008">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1008"/>
diff --git a/conf/directory/default/1009.xml b/conf/directory/default/1009.xml
index df2bb0ffb3..24db7f8152 100644
--- a/conf/directory/default/1009.xml
+++ b/conf/directory/default/1009.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1009" mailbox="1009">
+  <user id="1009">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1009"/>
diff --git a/conf/directory/default/1010.xml b/conf/directory/default/1010.xml
index 68d265c6e8..6d8e0c1bab 100644
--- a/conf/directory/default/1010.xml
+++ b/conf/directory/default/1010.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1010" mailbox="1010">
+  <user id="1010">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1010"/>
diff --git a/conf/directory/default/1011.xml b/conf/directory/default/1011.xml
index 38b778b743..79d731de5e 100644
--- a/conf/directory/default/1011.xml
+++ b/conf/directory/default/1011.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1011" mailbox="1011">
+  <user id="1011">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1011"/>
diff --git a/conf/directory/default/1012.xml b/conf/directory/default/1012.xml
index ad28864091..3839824fbc 100644
--- a/conf/directory/default/1012.xml
+++ b/conf/directory/default/1012.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1012" mailbox="1012">
+  <user id="1012">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1012"/>
diff --git a/conf/directory/default/1013.xml b/conf/directory/default/1013.xml
index 2258b1e20c..6f9c8e4753 100644
--- a/conf/directory/default/1013.xml
+++ b/conf/directory/default/1013.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1013" mailbox="1013">
+  <user id="1013">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1013"/>
diff --git a/conf/directory/default/1014.xml b/conf/directory/default/1014.xml
index 2bc0162857..6a554c0650 100644
--- a/conf/directory/default/1014.xml
+++ b/conf/directory/default/1014.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1014" mailbox="1014">
+  <user id="1014">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1014"/>
diff --git a/conf/directory/default/1015.xml b/conf/directory/default/1015.xml
index 1ff9f5f297..e94b8886a0 100644
--- a/conf/directory/default/1015.xml
+++ b/conf/directory/default/1015.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1015" mailbox="1015">
+  <user id="1015">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1015"/>
diff --git a/conf/directory/default/1016.xml b/conf/directory/default/1016.xml
index 1449355a35..4f856fc7be 100644
--- a/conf/directory/default/1016.xml
+++ b/conf/directory/default/1016.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1016" mailbox="1016">
+  <user id="1016">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1016"/>
diff --git a/conf/directory/default/1017.xml b/conf/directory/default/1017.xml
index 5899633c0a..b0e43a0238 100644
--- a/conf/directory/default/1017.xml
+++ b/conf/directory/default/1017.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1017" mailbox="1017">
+  <user id="1017">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1017"/>
diff --git a/conf/directory/default/1018.xml b/conf/directory/default/1018.xml
index dd13df2eac..6d7071942d 100644
--- a/conf/directory/default/1018.xml
+++ b/conf/directory/default/1018.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1018" mailbox="1018">
+  <user id="1018">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1018"/>
diff --git a/conf/directory/default/1019.xml b/conf/directory/default/1019.xml
index a06aea5c9b..f23a95f4ba 100644
--- a/conf/directory/default/1019.xml
+++ b/conf/directory/default/1019.xml
@@ -1,5 +1,5 @@
 <include>
-  <user id="1019" mailbox="1019">
+  <user id="1019">
     <params>
       <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1019"/>
diff --git a/conf/directory/default/brian.xml b/conf/directory/default/brian.xml
index 0fdc6ce7ba..05fe0c8324 100644
--- a/conf/directory/default/brian.xml
+++ b/conf/directory/default/brian.xml
@@ -3,7 +3,7 @@
       ipauth if you have an cidr= in the user attributes ie cidr="1.2.3.4/32"  
       see <node type="allow" domain="$${domain}"/> in default acl.conf.xml 
   -->
-  <user id="brian" mailbox="9999" cidr="192.0.2.0/24">
+  <user id="brian" cidr="192.0.2.0/24">
     <!-- Outbound Registrations Related to this user -->
     <gateways>
       <!--<gateway name="asterlink.com">-->