diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index d494233f5a..0f9024c297 100644
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1000" mailbox="1000">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1000"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1001.xml b/conf/directory/default/1001.xml
index cf976e71cf..9b9d80852d 100644
--- a/conf/directory/default/1001.xml
+++ b/conf/directory/default/1001.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1001" mailbox="1001">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1001"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1002.xml b/conf/directory/default/1002.xml
index efc0b1d68c..371018cee6 100644
--- a/conf/directory/default/1002.xml
+++ b/conf/directory/default/1002.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1002" mailbox="1002">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1002"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1003.xml b/conf/directory/default/1003.xml
index 09ac2bf4b2..2eb7e41e29 100644
--- a/conf/directory/default/1003.xml
+++ b/conf/directory/default/1003.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1003" mailbox="1003">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1003"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1004.xml b/conf/directory/default/1004.xml
index 9f0f578c06..3a461ff76e 100644
--- a/conf/directory/default/1004.xml
+++ b/conf/directory/default/1004.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1004" mailbox="1004">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1004"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1005.xml b/conf/directory/default/1005.xml
index c73eabbcf1..e2bf3524d7 100644
--- a/conf/directory/default/1005.xml
+++ b/conf/directory/default/1005.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1005" mailbox="1005">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1005"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1006.xml b/conf/directory/default/1006.xml
index aa37e768ed..e85f4a1945 100644
--- a/conf/directory/default/1006.xml
+++ b/conf/directory/default/1006.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1006" mailbox="1006">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1006"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1007.xml b/conf/directory/default/1007.xml
index 68406acb94..e73658bbb6 100644
--- a/conf/directory/default/1007.xml
+++ b/conf/directory/default/1007.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1007" mailbox="1007">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1007"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1008.xml b/conf/directory/default/1008.xml
index 531746b069..f7fd534790 100644
--- a/conf/directory/default/1008.xml
+++ b/conf/directory/default/1008.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1008" mailbox="1008">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1008"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1009.xml b/conf/directory/default/1009.xml
index 7ca7e042ad..df2bb0ffb3 100644
--- a/conf/directory/default/1009.xml
+++ b/conf/directory/default/1009.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1009" mailbox="1009">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1009"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1010.xml b/conf/directory/default/1010.xml
index 8de2f6b946..68d265c6e8 100644
--- a/conf/directory/default/1010.xml
+++ b/conf/directory/default/1010.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1010" mailbox="1010">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1010"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1011.xml b/conf/directory/default/1011.xml
index bbb3b795bc..38b778b743 100644
--- a/conf/directory/default/1011.xml
+++ b/conf/directory/default/1011.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1011" mailbox="1011">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1011"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1012.xml b/conf/directory/default/1012.xml
index 8059d6aa68..ad28864091 100644
--- a/conf/directory/default/1012.xml
+++ b/conf/directory/default/1012.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1012" mailbox="1012">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1012"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1013.xml b/conf/directory/default/1013.xml
index 57f1ad14b4..2258b1e20c 100644
--- a/conf/directory/default/1013.xml
+++ b/conf/directory/default/1013.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1013" mailbox="1013">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1013"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1014.xml b/conf/directory/default/1014.xml
index f9bf23b5e7..2bc0162857 100644
--- a/conf/directory/default/1014.xml
+++ b/conf/directory/default/1014.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1014" mailbox="1014">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1014"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1015.xml b/conf/directory/default/1015.xml
index 962dcb1627..1ff9f5f297 100644
--- a/conf/directory/default/1015.xml
+++ b/conf/directory/default/1015.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1015" mailbox="1015">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1015"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1016.xml b/conf/directory/default/1016.xml
index bd0fc8334f..1449355a35 100644
--- a/conf/directory/default/1016.xml
+++ b/conf/directory/default/1016.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1016" mailbox="1016">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1016"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1017.xml b/conf/directory/default/1017.xml
index b41f624ea2..5899633c0a 100644
--- a/conf/directory/default/1017.xml
+++ b/conf/directory/default/1017.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1017" mailbox="1017">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1017"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1018.xml b/conf/directory/default/1018.xml
index f2b339c5cb..dd13df2eac 100644
--- a/conf/directory/default/1018.xml
+++ b/conf/directory/default/1018.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1018" mailbox="1018">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1018"/>
     </params>
     <variables>
diff --git a/conf/directory/default/1019.xml b/conf/directory/default/1019.xml
index 082a3df76c..a06aea5c9b 100644
--- a/conf/directory/default/1019.xml
+++ b/conf/directory/default/1019.xml
@@ -1,7 +1,7 @@
 <include>
   <user id="1019" mailbox="1019">
     <params>
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="1019"/>
     </params>
     <variables>
diff --git a/conf/directory/default/brian.xml b/conf/directory/default/brian.xml
index f0fed9af27..0fdc6ce7ba 100644
--- a/conf/directory/default/brian.xml
+++ b/conf/directory/default/brian.xml
@@ -43,7 +43,7 @@
     </gateways>
     <params>
       <!-- omit password for authless registration -->
-      <param name="password" value="${default_password}"/>
+      <param name="password" value="$${default_password}"/>
       <param name="vm-password" value="9999"/><!--if vm-password is omitted password param is used-->
       <!--<param name="email-addr" value="me@mydomain.com"/>-->
       <!--<param name="vm-delete-file" value="true"/>-->