diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index c2b54c5ac3..1fdfcc1d97 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -30,11 +30,11 @@
 
 <!--# Outbound Proxy-->
 <!--# String-->
-    <P48></P48>
+    <P48>{$account.1.outbound_proxy_primary}</P48>
 
 <!--# Backup Outbound Proxy-->
 <!--# String-->
-    <P2333></P2333>
+    <P2333>{$account.1.outbound_proxy_secondary}</P2333>
 
 <!--# SIP User ID-->
 <!--# String-->
@@ -658,11 +658,11 @@
 
 <!--# Outbound Proxy-->
 <!--# String-->
-    <P403></P403>
+    <P403>{$account.2.outbound_proxy_primary}</P403>
 
 <!--# Backup Outbound Proxy-->
 <!--# String-->
-    <P2433></P2433>
+    <P2433>{$account.2.outbound_proxy_secondary}</P2433>
 
 <!--# SIP User ID-->
 <!--# String-->
@@ -1288,11 +1288,11 @@
 
 <!--# Outbound Proxy-->
 <!--# String-->
-    <P503></P503>
+    <P503>{$account.3.outbound_proxy_primary}</P503>
 
 <!--# Backup Outbound Proxy-->
 <!--# String-->
-    <P2533></P2533>
+    <P2533>{$account.3.outbound_proxy_secondary}</P2533>
 
 <!--# SIP User ID-->
 <!--# String-->
@@ -1914,11 +1914,11 @@
 
 <!--# Outbound Proxy-->
 <!--# String-->
-    <P603></P603>
+    <P603>{$account.4.outbound_proxy_primary}</P603>
 
 <!--# Backup Outbound Proxy-->
 <!--# String-->
-    <P2633></P2633>
+    <P2633>{$account.4.outbound_proxy_secondary}</P2633>
 
 <!--# SIP User ID-->
 <!--# String-->
@@ -2747,11 +2747,16 @@
 
 <!--# End User Password-->
 <!--# String: a-z, A-Z, 0-9-->
-    <P196></P196>
+    <P196>{$user_password}</P196>
 
 <!--# Admin password for web interface-->
 <!--# String: a-z, A-Z, 0-9-->
-    <P2>admin</P2>
+    
+{if isset($admin_password)}
+    <P2>{$admin_password}</P2>
+{else}
+    <P2>{$mac|replace:'-':''}</P2>
+{/if}
 
 
 <!--##############################################################################-->
@@ -2772,11 +2777,11 @@
 
 <!--# HTTP/HTTPS User Name-->
 <!--# String-->
-    <P1360></P1360>
+    <P1360>{$http_auth_username}</P1360>
 
 <!--# HTTP/HTTPS Password-->
 <!--# String-->
-    <P1361></P1361>
+    <P1361>{$http_auth_password}</P1361>
 
 <!--# Always Authenticate Before Challenge. 0 - No,  1 - Yes. Default is 0-->
 <!--# Number: 0, 1-->
@@ -3018,7 +3023,7 @@
 
 <!--# Disable SSH. 0 - No, 1 - Yes. Default is 0-->
 <!--# Number: 0, 1-->
-    <P276>0</P276>
+    <P276>1</P276>
 
 <!--##############################################################################-->
 <!--##  Phonebook/Phonebook Management-->
@@ -3492,12 +3497,12 @@
 <!--# Active-->
 <!--# Number: 0 - 8-->
 <!--# Mandatory-->
-    <P334>6</P334>
+    <P334>{$grandstream_lcd_brightness}</P334>
 
 <!--# Idle-->
 <!--# Number: 0 - 8-->
 <!--# Mandatory-->
-    <P335>2</P335>
+    <P335>{$grandstream_lcd_brightness_idle}</P335>
 
 <!--# LCD Contrast. Default is 10-->
 <!--# Number: 0 - 20-->