diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index 4dfaecf95b..795e93bc57 100644
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -1,14 +1,13 @@
 <include>
   <user id="1000" mailbox="1000">
     <params>
-      <param name="password" value="mypass"/>
-      <param name="vm-password" value="1234"/>
-      <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
-      <!--<param name="vm-email-all-messages" value="true"/>-->
+      <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1000"/>
+      <variable name="presence_id" value="1000@$${domain}"/>
       <variable name="user_context" value="default"/>
-      <variable name="effective_caller_id_name" value="Brian West"/>
+      <variable name="effective_caller_id_name" value="Extension 1000"/>
       <variable name="effective_caller_id_number" value="1000"/>
     </variables>
   </user>
diff --git a/conf/directory/default/1001.xml b/conf/directory/default/1001.xml
index b5a2ec7bad..b4fe373239 100644
--- a/conf/directory/default/1001.xml
+++ b/conf/directory/default/1001.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1001"/>
+      <variable name="presence_id" value="1001@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1001"/>
       <variable name="effective_caller_id_number" value="1001"/>
diff --git a/conf/directory/default/1002.xml b/conf/directory/default/1002.xml
index f596f2468d..24f2cb8257 100644
--- a/conf/directory/default/1002.xml
+++ b/conf/directory/default/1002.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1002"/>
+      <variable name="presence_id" value="1002@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1002"/>
       <variable name="effective_caller_id_number" value="1002"/>
diff --git a/conf/directory/default/1003.xml b/conf/directory/default/1003.xml
index 881276e2a6..4e11f8c3bb 100644
--- a/conf/directory/default/1003.xml
+++ b/conf/directory/default/1003.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1003"/>
+      <variable name="presence_id" value="1003@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1003"/>
       <variable name="effective_caller_id_number" value="1003"/>
diff --git a/conf/directory/default/1004.xml b/conf/directory/default/1004.xml
index 9381625392..3730c2d5b3 100644
--- a/conf/directory/default/1004.xml
+++ b/conf/directory/default/1004.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1004"/>
+      <variable name="presence_id" value="1004@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1004"/>
       <variable name="effective_caller_id_number" value="1004"/>
diff --git a/conf/directory/default/1005.xml b/conf/directory/default/1005.xml
index bb3a386ebf..fd8f9e4eea 100644
--- a/conf/directory/default/1005.xml
+++ b/conf/directory/default/1005.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1005"/>
+      <variable name="presence_id" value="1005@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1005"/>
       <variable name="effective_caller_id_number" value="1005"/>
diff --git a/conf/directory/default/1006.xml b/conf/directory/default/1006.xml
index ba0466f52c..ce0da902ff 100644
--- a/conf/directory/default/1006.xml
+++ b/conf/directory/default/1006.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1006"/>
+      <variable name="presence_id" value="1006@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1006"/>
       <variable name="effective_caller_id_number" value="1006"/>
diff --git a/conf/directory/default/1007.xml b/conf/directory/default/1007.xml
index d24ea59a0f..719f502f8e 100644
--- a/conf/directory/default/1007.xml
+++ b/conf/directory/default/1007.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1007"/>
+      <variable name="presence_id" value="1007@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1007"/>
       <variable name="effective_caller_id_number" value="1007"/>
diff --git a/conf/directory/default/1008.xml b/conf/directory/default/1008.xml
index 26bb35ee1b..3b3163e2d8 100644
--- a/conf/directory/default/1008.xml
+++ b/conf/directory/default/1008.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1008"/>
+      <variable name="presence_id" value="1008@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1008"/>
       <variable name="effective_caller_id_number" value="1008"/>
diff --git a/conf/directory/default/1009.xml b/conf/directory/default/1009.xml
index 6c72226ac3..564848b7ab 100644
--- a/conf/directory/default/1009.xml
+++ b/conf/directory/default/1009.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1009"/>
+      <variable name="presence_id" value="1009@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1009"/>
       <variable name="effective_caller_id_number" value="1009"/>
diff --git a/conf/directory/default/1010.xml b/conf/directory/default/1010.xml
index d425702a80..1b1e54a7e6 100644
--- a/conf/directory/default/1010.xml
+++ b/conf/directory/default/1010.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1010"/>
+      <variable name="presence_id" value="1010@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1010"/>
       <variable name="effective_caller_id_number" value="1010"/>
diff --git a/conf/directory/default/1011.xml b/conf/directory/default/1011.xml
index db8ddd8ef2..9143e7b1b1 100644
--- a/conf/directory/default/1011.xml
+++ b/conf/directory/default/1011.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1011"/>
+      <variable name="presence_id" value="1011@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1011"/>
       <variable name="effective_caller_id_number" value="1011"/>
diff --git a/conf/directory/default/1012.xml b/conf/directory/default/1012.xml
index 6e35756451..d3ed3b7e36 100644
--- a/conf/directory/default/1012.xml
+++ b/conf/directory/default/1012.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1012"/>
+      <variable name="presence_id" value="1012@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1012"/>
       <variable name="effective_caller_id_number" value="1012"/>
diff --git a/conf/directory/default/1013.xml b/conf/directory/default/1013.xml
index 779c139d3a..53a22c9400 100644
--- a/conf/directory/default/1013.xml
+++ b/conf/directory/default/1013.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1013"/>
+      <variable name="presence_id" value="1013@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1013"/>
       <variable name="effective_caller_id_number" value="1013"/>
diff --git a/conf/directory/default/1014.xml b/conf/directory/default/1014.xml
index 2391c41c85..5c832a55ce 100644
--- a/conf/directory/default/1014.xml
+++ b/conf/directory/default/1014.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1014"/>
+      <variable name="presence_id" value="1014@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1014"/>
       <variable name="effective_caller_id_number" value="1014"/>
diff --git a/conf/directory/default/1015.xml b/conf/directory/default/1015.xml
index c82102baf9..0c90bdbd9c 100644
--- a/conf/directory/default/1015.xml
+++ b/conf/directory/default/1015.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1015"/>
+      <variable name="presence_id" value="1015@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1015"/>
       <variable name="effective_caller_id_number" value="1015"/>
diff --git a/conf/directory/default/1016.xml b/conf/directory/default/1016.xml
index 86aba34c74..499460d985 100644
--- a/conf/directory/default/1016.xml
+++ b/conf/directory/default/1016.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1016"/>
+      <variable name="presence_id" value="1016@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1016"/>
       <variable name="effective_caller_id_number" value="1016"/>
diff --git a/conf/directory/default/1017.xml b/conf/directory/default/1017.xml
index 20567eb00b..673133e5f0 100644
--- a/conf/directory/default/1017.xml
+++ b/conf/directory/default/1017.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1017"/>
+      <variable name="presence_id" value="1017@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1017"/>
       <variable name="effective_caller_id_number" value="1017"/>
diff --git a/conf/directory/default/1018.xml b/conf/directory/default/1018.xml
index e2f3e03f9f..0d2f5d08eb 100644
--- a/conf/directory/default/1018.xml
+++ b/conf/directory/default/1018.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1018"/>
+      <variable name="presence_id" value="1018@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1018"/>
       <variable name="effective_caller_id_number" value="1018"/>
diff --git a/conf/directory/default/1019.xml b/conf/directory/default/1019.xml
index 8cbe1977b1..f9ca5b8d5d 100644
--- a/conf/directory/default/1019.xml
+++ b/conf/directory/default/1019.xml
@@ -4,6 +4,8 @@
       <param name="password" value="1234"/>
     </params>
     <variables>
+      <variable name="accountcode" value="1019"/>
+      <variable name="presence_id" value="1019@$${domain}"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1019"/>
       <variable name="effective_caller_id_number" value="1019"/>