diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
index 9735e579f..4fd8b5ca9 100644
--- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
@@ -162,10 +162,10 @@
 <P4507>300</P4507>
 
 <!-- Connection Request Username -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!--CPE SSL Certificate -->
 <!--P8220= -->
diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml
index 9574eb0d1..e1a4c36f5 100644
--- a/resources/templates/provision/grandstream/dp715/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml
@@ -101,9 +101,9 @@
 		<!-- Periodic Inform Interval (default is 300) -->
 		<P4507>300</P4507>
 		<!-- Connection Request Username -->
-		<P4511></P4511>
+		<P4511>{$mac|replace:'-':''|upper}</P4511>
 		<!-- Connection Request Password -->
-		<P4512></P4512>
+		<P4512>{$mac|replace:'-':''|upper}</P4512>
 		<!-- CPE SSL Certificate -->
 		<!-- P8220= -->
 		<!-- CPE SSL Private Key -->
diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
index 2f626be56..937cbfa07 100644
--- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
@@ -4548,10 +4548,10 @@
     <P4507>86400</P4507>
 
     <!-- # Connection Request Username -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port -->
     <P4518></P4518>
diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
index 3f2f3b02f..330a07002 100644
--- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
@@ -5959,11 +5959,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
index ce830c497..a0951499a 100644
--- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
@@ -1073,11 +1073,11 @@
 
 <!-- Connection Request Username -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- Connection Request Port -->
 <!-- Number -->
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index 728d0b347..99f5aa229 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -949,11 +949,11 @@
 
 <!--  Connection Request Username -->
 <!--  String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!--  Connection Request Password -->
 <!--  String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!--  Connection Request Port. Default is 0  -->
 <!--  Number -->
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index d4f8f9678..d57102223 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1292,10 +1292,10 @@
     <P4507>86400</P4507>
     <!--  Connection Request Username -->
     <!--  String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
     <!--  Connection Request Password -->
     <!--  String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
     <!--  Connection Request Port -->
     <!--  Number -->
     <P4518>0</P4518>
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index 358d12b97..132223450 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -1292,10 +1292,10 @@
     <P4507>86400</P4507>
     <!--  Connection Request Username -->
     <!--  String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
     <!--  Connection Request Password -->
     <!--  String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
     <!--  Connection Request Port -->
     <!--  Number -->
     <P4518>0</P4518>
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index bb2abf7ce..2330d502a 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -1704,11 +1704,11 @@
 
 <!-- Connection Request Username -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- Connection Request Port -->
 <!-- Number -->
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index c3d21d026..c58fa8758 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -1511,11 +1511,11 @@
 
 <!-- Connection Request Username -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- Connection Request Port -->
 <!-- Number -->
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index 4b07d7e04..f9a78d033 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -2270,10 +2270,10 @@
 <P4507>86400</P4507>
 <!--  Connection Request Username	 -->
 <!--  String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 <!--  Connection Request Password	 -->
 <!--  String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 <!--  Connection Request Port -->
 <!--  Number -->
 <P4518>7547</P4518>
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index b964ecd66..51be279db 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -6299,11 +6299,11 @@
 
 <!-- # Connection Request Username	 -->
 <!-- # String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- # Connection Request Password	 -->
 <!-- # String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- # Connection Request Port. Default is 7547. -->
 <!-- # Number -->
diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index 48e5216ac..733561aab 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -2989,11 +2989,11 @@
 
 <!--# Connection Request Username       -->
 <!--# String: a-z, A-Z, 0-9-->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!--# Connection Request Password       -->
 <!--# String: a-z, A-Z, 0-9-->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!--# Connection Request Port-->
 <!--# Number-->
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 92be242eb..5a4386782 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -2031,10 +2031,10 @@
     <P4507>86400</P4507>
     <!-- Connection Request Username -->
     <!-- String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
     <!-- Connection Request Password	 -->
     <!-- String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
     <!-- Connection Request Port. Default is 0. -->
     <!-- Number -->
     <P4518>0</P4518>
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 39f1e5471..3f1d7c357 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -2820,10 +2820,10 @@
     <P4507>86400</P4507>
     <!-- Connection Request Username -->
     <!-- String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
     <!-- Connection Request Password -->
     <!-- String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
     <!-- Connection Request Port -->
     <!-- Number -->
     <P4518>0</P4518>
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index 386b7e37d..82b7ba621 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -3479,11 +3479,11 @@
 
 <!-- Connection Request Username -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- Connection Request Port -->
 <!-- Number -->
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 937704471..39c32d3ee 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3177,10 +3177,10 @@ Account 5 Codec Settings
 <P4507>86400</P4507>
 
 <!-- Connection Request Username -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- Connection Request Port -->
 <P4518></P4518>
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index c756a7a61..163a7f2ee 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -3387,10 +3387,10 @@ Account 5 Codec Settings
 <P4507>86400</P4507>
 
 <!-- Connection Request Username -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- Connection Request Port -->
 <P4518></P4518>
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index 2beb67474..2f8767f65 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -5084,10 +5084,10 @@
 <P4507>86400</P4507>
 
 <!-- Connection Request Username -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- Connection Request Port -->
 <P4518></P4518>
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index 065ebdd8e..f7d156e3b 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -3534,10 +3534,10 @@
 <P4507>86400</P4507>
 
 <!-- Connection Request Username -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- Connection Request Port -->
 <P4518></P4518>
diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index 2c1e5f73e..d3d430341 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -167,11 +167,11 @@
     <P4507>300</P4507>
     <!-- Conncetion Request Username -->
     <!-- String Max Length: 64 -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
     <!-- Connection Request Password -->
     <!-- String Max Length: 64 -->
     <!-- Mandatory -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
     <!-- Connection Request Port (default is 7547) -->
     <!-- String -->
     <!-- Max Length: 5 characters -->
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index 96d53b271..5c3c199ff 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -290,12 +290,12 @@
 
 <!-- Conncetion Request Username -->
 <!-- String Max Length: 64 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
 <!-- String Max Length: 64 -->
 <!-- Mandatory -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 
 <!-- Maintenance-Security Settings -->
diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index 592f39646..693f529ef 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -126,10 +126,10 @@
 		<P4507>300</P4507>
 		<!-- Conncetion Request Username -->
 		<!-- Max Length: 64 characters -->
-		<P4511></P4511>
+		<P4511>{$mac|replace:'-':''|upper}</P4511>
 		<!-- Connection Request Password -->
 		<!-- Max Length: 64 characters -->
-		<P4512></P4512>
+		<P4512>{$mac|replace:'-':''|upper}</P4512>
 		<!-- Connection Request Port (default is 7547) -->
 		<!-- Max Length: 5 characters -->
 		<P4518>7547</P4518>
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index f0c3422f0..548d7ccb1 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -273,11 +273,11 @@
 
 <!--  Conncetion Request Username -->
 <!--  String -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!--  Connection Request Password -->
 <!--  String -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!--  Connection Request Port (default is 7547) -->
 <!--  String -->
diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml
index 3ad60d951..25c5dc457 100644
--- a/resources/templates/provision/grandstream/ht701/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml
@@ -189,11 +189,11 @@
 
 <!-- Connection Request Username -->
 <!-- String -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
 <!-- String -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- CPE SSL Certificate -->
 <P8220></P8220>
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 6c56934cf..cfdac3976 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -196,11 +196,11 @@
 
 <!-- Connection Request Username -->
 <!-- String -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password -->
 <!-- String -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- CPE SSL Certificate -->
 <P8220></P8220>
diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index 391053da4..e79714735 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -193,11 +193,11 @@
 
 <!-- Connection Request Username-->
 <!-- String-->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password-->
 <!-- String-->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- CPE SSL Certificate-->
 <P8220></P8220>
diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml
index 4e564845e..8db50926d 100644
--- a/resources/templates/provision/grandstream/ht801/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml
@@ -256,11 +256,11 @@
 
     <!-- # Connection Request Username -->
     <!-- # String -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password -->
     <!-- # String -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # CPE SSL Certificate -->
     <P8220></P8220>
diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml
index 3f57dce77..040cd6d61 100644
--- a/resources/templates/provision/grandstream/ht802/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml
@@ -256,11 +256,11 @@
 
     <!-- # Connection Request Username -->
     <!-- # String -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password -->
     <!-- # String -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # CPE SSL Certificate -->
     <P8220></P8220>