From d11ebf2e2d5b0ac8b5d20222e48b92d3bdcffc33 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Thu, 23 Jan 2014 05:26:53 +0000
Subject: [PATCH] Add admin_password and user_password to all of the
 grandstream phones.

---
 .../provision/grandstream/dp715.sm/{$mac}.xml |   5 +-
 .../provision/grandstream/dp715/{$mac}.xml    | 832 +++++++++---------
 .../provision/grandstream/gxp110x/{$mac}.xml  |   4 +-
 .../provision/grandstream/gxp116x/{$mac}.xml  |   4 +-
 .../provision/grandstream/gxp140x/{$mac}.xml  |   4 +-
 .../grandstream/gxp140xbk/{$mac}.xml          |   4 +-
 .../provision/grandstream/gxp1450/{$mac}.xml  |   4 +-
 .../grandstream/gxp1450bk/{$mac}.xml          |   4 +-
 .../provision/grandstream/gxp20xx/{$mac}.xml  | 192 +---
 .../provision/grandstream/gxp2124/{$mac}.xml  |   4 +-
 .../provision/grandstream/gxp21xx/{$mac}.xml  | 432 +--------
 .../grandstream/gxp21xxbk/{$mac}.xml          |   4 +-
 .../provision/grandstream/gxp2200/{$mac}.xml  |   4 +-
 .../provision/grandstream/gxv300x/{$mac}.xml  |   4 +-
 .../provision/grandstream/gxv3140/{$mac}.xml  |   4 +-
 .../provision/grandstream/gxv3175/{$mac}.xml  |   7 +-
 .../grandstream/gxv3175v2/{$mac}.xml          |   8 +-
 .../provision/grandstream/gxv3504/{$mac}.xml  | 684 +++++++-------
 .../provision/grandstream/gxw4004/{$mac}.xml  |   5 +-
 .../provision/grandstream/gxw4008/{$mac}.xml  |   5 +-
 .../provision/grandstream/gxw40xx/{$mac}.xml  |   4 +-
 .../provision/grandstream/gxw410x/{$mac}.xml  |   4 +-
 .../provision/grandstream/gxw42xx/{$mac}.xml  |   7 +-
 .../provision/grandstream/ht502/{$mac}.xml    |   5 +-
 .../provision/grandstream/ht503/{$mac}.xml    |   5 +-
 .../provision/grandstream/ht701/{$mac}.xml    |   6 +-
 .../provision/grandstream/ht702/{$mac}.xml    | 348 ++++----
 .../provision/grandstream/ht704/{$mac}.xml    |   6 +-
 28 files changed, 1021 insertions(+), 1578 deletions(-)

diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
index 2bd59e8b14..9168eb3e13 100644
--- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
@@ -30,7 +30,10 @@
 <P1></P1>
 
 <!-- Admin password for web interface -->
-<P2>admin</P2>
+<P2>{$admin_password}</P2>
+
+<!-- End User Password, MaxLength 32 -->
+<P196>{$user_password}</P196>
 
 <!-- Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) -->
 <P38>48</P38>
diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml
index 4678fd4e39..101203753b 100644
--- a/resources/templates/provision/grandstream/dp715/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml
@@ -1,668 +1,668 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
+<?xml version="1.0" encoding="UTF-8" ?>
 <gs_provision version="1">
 <config version="1">
 
-	<!-- Advanced Settings. -->                                                        
-		<!-- Password for configuration file authentication -->    
+	<!-- Advanced Settings. -->
+		<!-- Password for configuration file authentication -->
 		<P1></P1>
-		<!-- Admin password for web interface -->    
-		<P2>admin</P2>
-		<!-- Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) -->    
+		<!-- Admin password for web interface -->
+		<P2>{$admin_password}</P2>
+		<!-- Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) -->
 		<P38>48</P38>
-		<!-- Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP) -->    
+		<!-- Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP) -->
 		<P51>0</P51>
-		<!-- Layer 2 QoS. 802.1p priority value (0 - 7) -->    
+		<!-- Layer 2 QoS. 802.1p priority value (0 - 7) -->
 		<P87>0</P87>
-		<!-- 802.1p priority value (NATed traffic) -->    
+		<!-- 802.1p priority value (NATed traffic) -->
 		<P230>0</P230>
-		<!-- STUN server -->    
-		<P76></P76> 
-		<!-- Keep-alive interval (in seconds. default 20 seconds) -->    
+		<!-- STUN server -->
+		<P76></P76>
+		<!-- Keep-alive interval (in seconds. default 20 seconds) -->
 		<P84>20</P84>
-		<!-- Use STUN to detect network connectivity. 0 - No, 1 - Yes.  -->    
+		<!-- Use STUN to detect network connectivity. 0 - No, 1 - Yes.  -->
 		<P474>0</P474>
-		<!-- Total STUN response misses to restart DHCP (mininum=3 default=3) -->    
+		<!-- Total STUN response misses to restart DHCP (mininum=3 default=3) -->
 		<P475>3</P475>
 
-	<!-- Firmware Upgrade -->    
-		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->    
+	<!-- Firmware Upgrade -->
+		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
 		<P212>1</P212>
-		<!-- Firmware Server Path -->    
+		<!-- Firmware Server Path -->
 		<P192>fm.grandstream.com/gs</P192>
-		<!-- Config Server Path -->    
+		<!-- Config Server Path -->
 		<P237>{$domain_name}{$project_path}/app/provision</P237>
-		<!-- XML Config File Password -->    
+		<!-- XML Config File Password -->
 		<P1359></P1359>
-		<!-- HTTP/HTTPS User Name -->    
+		<!-- HTTP/HTTPS User Name -->
 		<P1360></P1360>
-		<!-- HTTP/HTTPS Password -->    
+		<!-- HTTP/HTTPS Password -->
 		<P1361></P1361>
-		<!-- Firmware File Prefix -->    
+		<!-- Firmware File Prefix -->
 		<P232></P232>
-		<!-- Firmware File Postfix -->    
+		<!-- Firmware File Postfix -->
 		<P233></P233>
-		<!-- Config File Prefix -->    
+		<!-- Config File Prefix -->
 		<P234></P234>
-		<!-- Config File Postfix -->    
+		<!-- Config File Postfix -->
 		<P235></P235>
-		<!-- Allow DHCP Option 66 to override server. 0 - No, 1 - Yes. Default is Yes. -->    
-		<!-- When set to Yes(1), it will override the configured provision path and method. -->    
+		<!-- Allow DHCP Option 66 to override server. 0 - No, 1 - Yes. Default is Yes. -->
+		<!-- When set to Yes(1), it will override the configured provision path and method. -->
 		<P145>1</P145>
-		<!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->    
+		<!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 		<P194>0</P194>
-		<!-- Check for new firmware/config file every () minutes, unit is in minute, minimum 60 minutes, default is 7 days. -->    
+		<!-- Check for new firmware/config file every () minutes, unit is in minute, minimum 60 minutes, default is 7 days. -->
 		<P193>10080</P193>
-		<!-- Automatic Upgrade. Daily at hour(0-23) -->    
+		<!-- Automatic Upgrade. Daily at hour(0-23) -->
 		<P285>1</P285>
-		<!-- Automatic Upgrade. Weekly on day (0-6) -->    
+		<!-- Automatic Upgrade. Weekly on day (0-6) -->
 		<P286>1</P286>
-		<!-- 0 = Always Check for New Firmware  -->    
-		<!-- 1 = Check New Firmware only when F/W pre/suffix changes  -->    
-		<!-- 2 = Always Skip the Firmware Check -->    
+		<!-- 0 = Always Check for New Firmware  -->
+		<!-- 1 = Check New Firmware only when F/W pre/suffix changes  -->
+		<!-- 2 = Always Skip the Firmware Check -->
 		<P238>0</P238>
-		<!-- Authenticate Config File. 0 - No, 1 - Yes. -->    
+		<!-- Authenticate Config File. 0 - No, 1 - Yes. -->
 		<P240>0</P240>
-		<!-- Firmware Key (AES 128, in Hexadecimal Representation) -->    
+		<!-- Firmware Key (AES 128, in Hexadecimal Representation) -->
 		<P242></P242>
-		<!-- SSL Certificate -->    
-		<!-- P280= -->    
-		<!-- SSL Private Key -->    
-		<!-- P279= -->    
-		<!-- SSL Private Key Password -->    
-		<!-- P281= -->    
-		<!-- ACS URL -->    
-		<!-- P4503= -->    
-		<!-- ACS Username -->    
+		<!-- SSL Certificate -->
+		<!-- P280= -->
+		<!-- SSL Private Key -->
+		<!-- P279= -->
+		<!-- SSL Private Key Password -->
+		<!-- P281= -->
+		<!-- ACS URL -->
+		<!-- P4503= -->
+		<!-- ACS Username -->
 		<P4504></P4504>
-		<!-- ACS Password -->    
+		<!-- ACS Password -->
 		<P4505></P4505>
-		<!-- Periodic Inform Enable 0 - No, 1 - Yes (default is No) -->    
+		<!-- Periodic Inform Enable 0 - No, 1 - Yes (default is No) -->
 		<P4506>0</P4506>
-		<!-- Periodic Inform Interval (default is 300) -->    
+		<!-- Periodic Inform Interval (default is 300) -->
 		<P4507>300</P4507>
-		<!-- Connection Request Username -->    
+		<!-- Connection Request Username -->
 		<P4511></P4511>		
-		<!-- Connection Request Password -->    
+		<!-- Connection Request Password -->
 		<P4512></P4512>
-		<!-- CPE SSL Certificate -->    
-		<!-- P8220= --> 	  
-		<!-- CPE SSL Private Key -->    
-		<!-- P8221= -->    
-		<!-- Call Progress Tones  -->                
-		<!-- Dial Tone -->    
-		<P4000>f1=350@-13,f2=440@-13,c=0/0;</P4000> -->    
-		<!-- Ringback Tone -->    
+		<!-- CPE SSL Certificate -->
+		<!-- P8220= --> 	
+		<!-- CPE SSL Private Key -->
+		<!-- P8221= -->
+		<!-- Call Progress Tones  -->
+		<!-- Dial Tone -->
+		<P4000>f1=350@-13,f2=440@-13,c=0/0;</P4000> -->
+		<!-- Ringback Tone -->
 		<P4001>f1=440@-19,f2=480@-19,c=2000/4000;</P4001>
-		<!-- Busy Tone -->    
+		<!-- Busy Tone -->
 		<P4002>f1=480@-24,f2=620@-24,c=500/500;</P4002>
-		<!-- Reorder Tone -->    
+		<!-- Reorder Tone -->
 		<P4003>f1=480@-24,f2=620@-24,c=250/250;</P4003>
-		<!-- Confirmation Tone -->    
+		<!-- Confirmation Tone -->
 		<P4004>f1=350@-11,f2=440@-11,c=100/100-100/100-100/100;</P4004>
-		<!-- Call Waiting tone -->    
+		<!-- Call Waiting tone -->
 		<P4005>f1=440@-13,c=300/300-300/10000;</P4005>
-		<!-- Lock keypad update.  0 - No, 1 - Yes. (configuration update via keypad is disabled if set to Yes) -->    
+		<!-- Lock keypad update.  0 - No, 1 - Yes. (configuration update via keypad is disabled if set to Yes) -->
 		<P88>0</P88>
 		<!-- Disable voice prompt. 0 - No, 1 - Yes.
-		<P253>0</P253> -->    
-		<!-- Disable Direct IP Call. 0 - No, 1 - Yes. -->    
+		<P253>0</P253> -->
+		<!-- Disable Direct IP Call. 0 - No, 1 - Yes. -->
 		<P277>0</P277>
-		<!-- NTP Server -->    
-		<P30>us.pool.ntp.org</P30>   
-		<!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->    
-		<!-- When set to Yes(1), it will override the configured NTP server. -->    
+		<!-- NTP Server -->
+		<P30>us.pool.ntp.org</P30>
+		<!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
+		<!-- When set to Yes(1), it will override the configured NTP server. -->
 		<P144>0</P144>
-		<!-- Syslog Server (name of the server, max length is 64 characters) -->    
+		<!-- Syslog Server (name of the server, max length is 64 characters) -->
 		<P207></P207>
-		<!-- Syslog Level (Default setting is NONE) -->    
-		<!-- 0 - NONE, 1 - DEBUG, 2 - INFO, 3 - WARNING, 4 - ERROR -->    
+		<!-- Syslog Level (Default setting is NONE) -->
+		<!-- 0 - NONE, 1 - DEBUG, 2 - INFO, 3 - WARNING, 4 - ERROR -->
 		<P208>0</P208>
-		<!-- Send SIP Log. 0 - No, 1 - Yes. (If set to yes, The unit will replicate the received and send SIP packets on the syslog) -->    
+		<!-- Send SIP Log. 0 - No, 1 - Yes. (If set to yes, The unit will replicate the received and send SIP packets on the syslog) -->
 		<P1387>0</P1387>
-		<!-- Update Handset Time -->    
-		<!-- 0 - Skip when reboot due to provisioning, 1 - Never, 2 - Always -->    
+		<!-- Update Handset Time -->
+		<!-- 0 - Skip when reboot due to provisioning, 1 - Never, 2 - Always -->
 		<P20000>0</P20000>
-		<!-- MWI LED Blinking -->    
-		<!-- 0 - diable, 1 - enable -->    
+		<!-- MWI LED Blinking -->
+		<!-- 0 - diable, 1 - enable -->
 		<P20001>1</P20001>
 
-	<!-- Profile 1 Settings  --> 
-		<!-- Profile Active. 0 - No, 1 - Yes. -->    
+	<!-- Profile 1 Settings  -->
+		<!-- Profile Active. 0 - No, 1 - Yes. -->
 		<P271>1</P271>
-		<!-- Primary SIP Server -->    
+		<!-- Primary SIP Server -->
 		<P47>{$server_address_1}</P47>
-		<!-- Failover SIP Server -->    
+		<!-- Failover SIP Server -->
 		<P967></P967>
-		<!-- Prefer Primary SIP Server. 0 - No, 1 - Yes. -->    
+		<!-- Prefer Primary SIP Server. 0 - No, 1 - Yes. -->
 		<P4567>1</P4567>
-		<!-- Outbound Proxy -->    
+		<!-- Outbound Proxy -->
 		<P48></P48>
-		<!-- SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->    
+		<!-- SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->
 		<P130>0</P130>
-		<!-- NAT Traversal (STUN) 0 - No, 2 - No but send keep-alive, 1 - Yes -->    
+		<!-- NAT Traversal (STUN) 0 - No, 2 - No but send keep-alive, 1 - Yes -->
 		<P52>0</P52>
-		<!-- DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. -->    
+		<!-- DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. -->
 		<P103>0</P103>
-		<!-- Tel URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled -->    
+		<!-- Tel URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled -->
 		<P63>0</P63>
-		<!-- SIP Registration. 0 - No, 1 - Yes -->    
+		<!-- SIP Registration. 0 - No, 1 - Yes -->
 		<P31>1</P31>
-		<!-- Unregister On Reboot. 0 - No, 1 - Yes -->    
+		<!-- Unregister On Reboot. 0 - No, 1 - Yes -->
 		<P81>0</P81>
-		<!-- Outgoing call without Registration. 0 - No, 1 - Yes -->    
+		<!-- Outgoing call without Registration. 0 - No, 1 - Yes -->
 		<P109>1</P109>
-		<!-- Register Expiration (in minutes. default 1 hour, max 45 days) -->    
+		<!-- Register Expiration (in minutes. default 1 hour, max 45 days) -->
 		<P32>3</P32>
 		<!-- SIP Registration Failure Retry Wait Time, in seconds. Between 1-3600, default is 20
-		<P138>20</P138> -->    
-		<!-- Local SIP port (default 5060) -->    
+		<P138>20</P138> -->
+		<!-- Local SIP port (default 5060) -->
 		<P40>5060</P40>
-		<!-- Local RTP port (1024-65535, default 5004) -->    
+		<!-- Local RTP port (1024-65535, default 5004) -->
 		<P39>5004</P39>
-		<!-- Use Random Port. 0 - No, 1 - Yes -->    
-		<P78>0</P78> 
-		<!-- Refer-To Use Target Contact. 0 - No, 1 - Yes -->    
+		<!-- Use Random Port. 0 - No, 1 - Yes -->
+		<P78>0</P78>
+		<!-- Refer-To Use Target Contact. 0 - No, 1 - Yes -->
 		<P135>0</P135>
 		<!-- Transfer on Conference Hangup. 0 - No, 1 - Yes
-		<P4560>0</P4560> -->    
-		<!-- Disable Bellcore Style 3-Way Conference. 0 - No, 1 - Yes. -->    
+		<P4560>0</P4560> -->
+		<!-- Disable Bellcore Style 3-Way Conference. 0 - No, 1 - Yes. -->
 		<P4830>0</P4830>
-		<!-- Remove OBP from Route Header. 0 - No, 1 - Yes -->    
-		<P4562>0</P4562>   
-		<!-- Support SIP Instance ID. 0 - No, 1 - Yes -->    
+		<!-- Remove OBP from Route Header. 0 - No, 1 - Yes -->
+		<P4562>0</P4562>
+		<!-- Support SIP Instance ID. 0 - No, 1 - Yes -->
 		<P288>1</P288>
-		<!-- Validate Incoming SIP Message . 0 - No, 1 - Yes -->    
+		<!-- Validate Incoming SIP Message . 0 - No, 1 - Yes -->
 		<P4340>0</P4340>
-		<!-- Check SIP User ID for incoming INVITE. 0 - No, 1 - Yes (no direct IP calling if Yes) -->    
+		<!-- Check SIP User ID for incoming INVITE. 0 - No, 1 - Yes (no direct IP calling if Yes) -->
 		<P258>0</P258>
-		<!-- Authenticate incoming INVITE. 0 - No, 1 - Yes -->    
+		<!-- Authenticate incoming INVITE. 0 - No, 1 - Yes -->
 		<P2346>0</P2346>
-		<!-- Allow Incoming SIP Messages from SIP Proxy Only. 0 - No, 1 - Yes -->    
-		<P243>0</P243> 
-		<!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) -->    
-		<!-- 50 - 0.5 sec, 100 - 1 sec, 200 - 2 sec, 400 - 4 sec, 800 - 8 sec. Default 50. -->    
+		<!-- Allow Incoming SIP Messages from SIP Proxy Only. 0 - No, 1 - Yes -->
+		<P243>0</P243>
+		<!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) -->
+		<!-- 50 - 0.5 sec, 100 - 1 sec, 200 - 2 sec, 400 - 4 sec, 800 - 8 sec. Default 50. -->
 		<P209>50</P209>
-		<!-- SIP T2 Interval. RFC 3261 T2 value. The maximum retransmit interval for non-INVITE requests and INVITE responses. -->    
-		<!-- 200 - 2 sec, 400 - 4 sec, 800 - 8 sec, 1600 - 16 sec, 3200 - 32 sec. Default 400. -->    
+		<!-- SIP T2 Interval. RFC 3261 T2 value. The maximum retransmit interval for non-INVITE requests and INVITE responses. -->
+		<!-- 200 - 2 sec, 400 - 4 sec, 800 - 8 sec, 1600 - 16 sec, 3200 - 32 sec. Default 400. -->
 		<P250>400</P250>
-		<!-- DTMF Payload Type -->    
+		<!-- DTMF Payload Type -->
 		<P79>101</P79>
-		<!-- Preferred DTMF method.  -->    
-		<!-- 100 - In-audio, 101 - RFC2833, 102 - SIP INFO -->    
-		<!-- Priority 1 -->    
+		<!-- Preferred DTMF method.  -->
+		<!-- 100 - In-audio, 101 - RFC2833, 102 - SIP INFO -->
+		<!-- Priority 1 -->
 		<P850>101</P850>
-		<!-- Priority 2 -->    
+		<!-- Priority 2 -->
 		<P851>102</P851>
-		<!-- Priority 3 -->    
+		<!-- Priority 3 -->
 		<P852>100</P852>
-		<!-- Disable DTMF Negotiation. 0 - No, 1 - Yes -->    
+		<!-- Disable DTMF Negotiation. 0 - No, 1 - Yes -->
 		<P4825>0</P4825>
-		<!-- Send Hook Flash Event. 0 - No, 1 - Yes -->    
+		<!-- Send Hook Flash Event. 0 - No, 1 - Yes -->
 		<P74>0</P74>
-		<!-- Enable Call Features. 0 - No, 1 - Yes -->    
+		<!-- Enable Call Features. 0 - No, 1 - Yes -->
 		<P191>1</P191>
-		<!-- Proxy-Require  -->    
+		<!-- Proxy-Require  -->
 		<P197></P197>
-		<!-- Use NAT IP (used in SIP/SDP message if specified) -->    
+		<!-- Use NAT IP (used in SIP/SDP message if specified) -->
 		<P101></P101>
-		<!-- Use SIP User-Agent Header -->    
+		<!-- Use SIP User-Agent Header -->
 		<P4834></P4834>
-		<!-- Ring Timeout. (10-300, default is 60 seconds) -->    
+		<!-- Ring Timeout. (10-300, default is 60 seconds) -->
 		<P185>60</P185>
-		<!-- Hunting Group Ring Timeout. (5-300, default is 20 seconds) -->    
+		<!-- Hunting Group Ring Timeout. (5-300, default is 20 seconds) -->
 		<P4330>20</P4330>
-		<!-- Hunting Group Type. 1 - Linear, 2 - Parallel, 3 - Shared line -->    
+		<!-- Hunting Group Type. 1 - Linear, 2 - Parallel, 3 - Shared line -->
 		<P4395>1</P4395>
-		<!-- Delayed Call Forward Wait Time. Allowed range 1-120, in seconds. Default 20 seconds. -->    
+		<!-- Delayed Call Forward Wait Time. Allowed range 1-120, in seconds. Default 20 seconds. -->
 		<P139>20</P139>
-		<!-- No Key Entry Timeout. Default - 4 seconds. -->    
+		<!-- No Key Entry Timeout. Default - 4 seconds. -->
 		<P85>4</P85>
-		<!-- Early Dial. 0 - No, 1 - Yes (use "Yes" only if proxy supports 484 response) -->    
+		<!-- Early Dial. 0 - No, 1 - Yes (use "Yes" only if proxy supports 484 response) -->
 		<P29>0</P29>
-		<!-- Dial Plan Prefix.(this prefix string is added to each dialed number) -->    
+		<!-- Dial Plan Prefix.(this prefix string is added to each dialed number) -->
 		<P66></P66>
-		<!-- Use as Dial Key. 0 - No, 1 - Yes (if set to Yes, "#" will function as the "(Re-)Dial" key) -->    
+		<!-- Use as Dial Key. 0 - No, 1 - Yes (if set to Yes, "#" will function as the "(Re-)Dial" key) -->
 		<P72>1</P72>
-		<!-- Dial Plan -->    
-		<P4200>{ x+ | *x+ | *xx*x+ }</P4200>    
-		<!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->    
+		<!-- Dial Plan -->
+		<P4200>{ x+ | *x+ | *xx*x+ }</P4200>
+		<!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
 		<P99>0</P99>
-		<!-- Send Anonymous. 0 - No, 1 - Yes  (caller ID will be blocked if set to Yes) -->    
+		<!-- Send Anonymous. 0 - No, 1 - Yes  (caller ID will be blocked if set to Yes) -->
 		<P65>0</P65>
-		<!-- Disable Call-Waiting. 0 - No, 1 - Yes -->    
+		<!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 		<P91>0</P91>
-		<!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->    
+		<!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->
 		<P714>0</P714>
-		<!-- Disable Reminder Ring for On-Hold Call. 0- No, 1 - Yes -->    
+		<!-- Disable Reminder Ring for On-Hold Call. 0- No, 1 - Yes -->
 		<P4360>0</P4360>
-		<!-- Anonymous Call Rejection. 0 - No, 1 - Yes. -->    
+		<!-- Anonymous Call Rejection. 0 - No, 1 - Yes. -->
 		<P129>0</P129>
-		<!-- Session Expiration (in seconds. default 180 seconds. Allowed value: 90-65535) -->    
+		<!-- Session Expiration (in seconds. default 180 seconds. Allowed value: 90-65535) -->
 		<P260>180</P260>
-		<!-- Minimum SE (in seconds. default 90 seconds, must be lower than or equal to P260) -->    
-		<P261>90</P261> 
-		<!-- Caller Request Timer (Request for timer when calling) 0 - No, 1 - Yes -->    
-		<P262>0</P262> 
-		<!-- Callee Request Timer (Request for timer when called. i.e. if remote party supports timer but did not request for one) 0 - No, 1 - Yes -->    
+		<!-- Minimum SE (in seconds. default 90 seconds, must be lower than or equal to P260) -->
+		<P261>90</P261>
+		<!-- Caller Request Timer (Request for timer when calling) 0 - No, 1 - Yes -->
+		<P262>0</P262>
+		<!-- Callee Request Timer (Request for timer when called. i.e. if remote party supports timer but did not request for one) 0 - No, 1 - Yes -->
 		<P263>0</P263>
-		<!-- Force Timer (Still use timer when remote party does not support timer) 0 - No, 1 - Yes -->    
+		<!-- Force Timer (Still use timer when remote party does not support timer) 0 - No, 1 - Yes -->
 		<P264>0</P264>
-		<!-- UAC Specify Refresher. 0 - omit, 1 - UAC, 2 - UAS -->    
+		<!-- UAC Specify Refresher. 0 - omit, 1 - UAC, 2 - UAS -->
 		<P266>0</P266>
-		<!-- UAS Specify Refresher. 1 - UAC, 2 - UAS -->    
+		<!-- UAS Specify Refresher. 1 - UAC, 2 - UAS -->
 		<P267>1</P267> 		
-		<!-- Force INVITE (Always refresh with INVITE instead of UPDATE even when remote party supports UPDATE) 0 - No, 1 - Yes -->    
+		<!-- Force INVITE (Always refresh with INVITE instead of UPDATE even when remote party supports UPDATE) 0 - No, 1 - Yes -->
 		<P265>0</P265>
-		<!-- Enable 100rel. 0 - No, 1 - Yes -->    
+		<!-- Enable 100rel. 0 - No, 1 - Yes -->
 		<P272>0</P272>
 
-	<!-- Codec/Voice Quality settings  -->    
+	<!-- Codec/Voice Quality settings  -->
 		<!-- Preferred Vocoder -->
-		<!-- 0 - PCMU, 8 - PCMA, 4 - G.723, 18 - G.729, 2 - G.726-32, 98 - iLBC -->    
-		<!-- Choice 1.  -->    
+		<!-- 0 - PCMU, 8 - PCMA, 4 - G.723, 18 - G.729, 2 - G.726-32, 98 - iLBC -->
+		<!-- Choice 1.  -->
 		<P57>0</P57>
-		<!-- Choice 2. -->     
+		<!-- Choice 2. -->
 		<P58>8</P58>
-		<!-- Choice 3. -->     
+		<!-- Choice 3. -->
 		<P59>4</P59>
-		<!-- Choice 4. -->     
+		<!-- Choice 4. -->
 		<P60>18</P60>
-		<!-- Choice 5. -->     
+		<!-- Choice 5. -->
 		<P61>2</P61>
-		<!-- Choice 6. -->     
+		<!-- Choice 6. -->
 		<P62>98</P62>
-		<!-- VAD. 0 - No, 1 - Yes -->    
+		<!-- VAD. 0 - No, 1 - Yes -->
 		<P50>0</P50>
-		<!-- Jitter buffer type.  0 - Fixed, 1 - Adaptive -->    
+		<!-- Jitter buffer type.  0 - Fixed, 1 - Adaptive -->
 		<P133>1</P133>
-		<!-- Jitter buffer length. 0 - Low, 1 - Medium, 2 - High -->    
+		<!-- Jitter buffer length. 0 - Low, 1 - Medium, 2 - High -->
 		<P132>1</P132>
-		<!-- SRTP Mode -->    
-		<!-- 0 = Disabled -->    
-		<!-- 1 = Enabled but not forced -->    
-		<!-- 2 = Enabled and forced -->    
+		<!-- SRTP Mode -->
+		<!-- 0 = Disabled -->
+		<!-- 1 = Enabled but not forced -->
+		<!-- 2 = Enabled and forced -->
 		<P183>0</P183>
-		<!-- G723 rate. 0 - 6.3kbps encoding rate, 1 - 5.3kbps encoding rate -->    
+		<!-- G723 rate. 0 - 6.3kbps encoding rate, 1 - 5.3kbps encoding rate -->
 		<P49>0</P49>
-		<!-- Use First Matching Vocoder in 200OK SDP. 0 - No, 1 - Yes -->    
+		<!-- Use First Matching Vocoder in 200OK SDP. 0 - No, 1 - Yes -->
 		<P4363>0</P4363>
-		<!-- iLBC Frame Size. 0 - 20ms(default), 1 - 30ms. -->    
+		<!-- iLBC Frame Size. 0 - 20ms(default), 1 - 30ms. -->
 		<P97>0</P97>
-		<!-- iLBC payload type. (between 96 and 127, default is 97). -->    
+		<!-- iLBC payload type. (between 96 and 127, default is 97). -->
 		<P96>97</P96>
-		<!-- Voice Frames per Packet. (up to 10/20/32/64 for G711/G726/G723/other codecs respectively)  -->    
+		<!-- Voice Frames per Packet. (up to 10/20/32/64 for G711/G726/G723/other codecs respectively)  -->
 		<P37>2</P37>
-		<!-- Symmetric RTP. 0 - No, 1 - Yes -->    
+		<!-- Symmetric RTP. 0 - No, 1 - Yes -->
 		<P291>0</P291>
 
-	<!-- Profile 2 Settings. -->    
-		<!-- Profile Active. 0 - No, 1 - Yes. -->    
+	<!-- Profile 2 Settings. -->
+		<!-- Profile Active. 0 - No, 1 - Yes. -->
 		<P401>1</P401>
-		<!-- Primary SIP Server -->    
+		<!-- Primary SIP Server -->
 		<P747>{$server_address_2}</P747>
-		<!-- Failover SIP Server -->    
+		<!-- Failover SIP Server -->
 		<P987></P987>
-		<!-- Prefer Primary SIP Server. 0 - No, 1 - Yes. -->    
+		<!-- Prefer Primary SIP Server. 0 - No, 1 - Yes. -->
 		<P4568>1</P4568>
-		<!-- Outbound Proxy -->    
+		<!-- Outbound Proxy -->
 		<P748></P748>
-		<!-- SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->    
+		<!-- SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->
 		<P830>0</P830>
-		<!-- NAT Traversal (STUN). 0 - No, 2 - No but send keep-alive, 1 - Yes -->    
+		<!-- NAT Traversal (STUN). 0 - No, 2 - No but send keep-alive, 1 - Yes -->
 		<P730>0</P730>
-		<!-- DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. -->    
+		<!-- DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. -->
 		<P702>0</P702>
-		<!-- Tel URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled -->    
+		<!-- Tel URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled -->
 		<P763>0</P763>
-		<!-- SIP Registration. 0 - No, 1 - Yes -->    
+		<!-- SIP Registration. 0 - No, 1 - Yes -->
 		<P731>1</P731>
-		<!-- Unregister On Reboot. 0 - No, 1 - Yes -->    
+		<!-- Unregister On Reboot. 0 - No, 1 - Yes -->
 		<P752>0</P752>
-		<!-- Outgoing call without Registration. 0 - No, 1 - Yes -->    
+		<!-- Outgoing call without Registration. 0 - No, 1 - Yes -->
 		<P813>1</P813>
-		<!-- Register Expiration (in minutes. default 1 hour, max 45 days) -->    
+		<!-- Register Expiration (in minutes. default 1 hour, max 45 days) -->
 		<P732>3</P732>
-		<!-- SIP Registration Failure Retry Wait Time, in seconds. Between 1-3600, default is 20 -->    
+		<!-- SIP Registration Failure Retry Wait Time, in seconds. Between 1-3600, default is 20 -->
 		<P471>20</P471>
-		<!-- Local SIP port (default 6060) -->    
+		<!-- Local SIP port (default 6060) -->
 		<P740>6060</P740>
-		<!-- Local RTP port (1024-65535, default 6004) -->    
+		<!-- Local RTP port (1024-65535, default 6004) -->
 		<P739>6004</P739>
-		<!-- Use Random Port. 0 - No, 1 - Yes -->    
+		<!-- Use Random Port. 0 - No, 1 - Yes -->
 		<P778>0</P778>
-		<!-- Refer-To Use Target Contact. 0 - No, 1 - Yes -->    
+		<!-- Refer-To Use Target Contact. 0 - No, 1 - Yes -->
 		<P469>0</P469>
-		<!-- Transfer on Conference Hangup. 0 - No, 1 - Yes -->    
+		<!-- Transfer on Conference Hangup. 0 - No, 1 - Yes -->
 		<P4561>0</P4561>
-		<!-- Disable Bellcore Style 3-Way Conference. 0 - No, 1 - Yes. -->    
+		<!-- Disable Bellcore Style 3-Way Conference. 0 - No, 1 - Yes. -->
 		<P4831>0</P4831>
-		<!-- Remove OBP from Route Header. 0 - No, 1 - Yes -->    
+		<!-- Remove OBP from Route Header. 0 - No, 1 - Yes -->
 		<P4563>0</P4563>
-		<!-- Support SIP Instance ID. 0 - No, 1 - Yes -->    
+		<!-- Support SIP Instance ID. 0 - No, 1 - Yes -->
 		<P489>1</P489>
-		<!-- Validate Incoming SIP Message. 0 - No, 1 - Yes -->    
+		<!-- Validate Incoming SIP Message. 0 - No, 1 - Yes -->
 		<P4341>0</P4341>
-		<!-- Check SIP User ID for incoming INVITE. 0 - No, 1 - Yes -->    
+		<!-- Check SIP User ID for incoming INVITE. 0 - No, 1 - Yes -->
 		<P449>0</P449>
-		<!-- Authenticate incoming INVITE. 0 - No, 1 - Yes -->    
-		<P2446>0</P2446> 
-		<!-- Allow Incoming SIP Messages from SIP Proxy Only. 0 - No, 1 - Yes -->    
+		<!-- Authenticate incoming INVITE. 0 - No, 1 - Yes -->
+		<P2446>0</P2446>
+		<!-- Allow Incoming SIP Messages from SIP Proxy Only. 0 - No, 1 - Yes -->
 		<P743>0</P743>
-		<!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) -->    
-		<!-- 50 - 0.5 sec, 100 - 1 sec, 200 - 2 sec, 400 - 4 sec, 800 - 8 sec. Default 50. -->    
+		<!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) -->
+		<!-- 50 - 0.5 sec, 100 - 1 sec, 200 - 2 sec, 400 - 4 sec, 800 - 8 sec. Default 50. -->
 		<P440>50</P440>		
-		<!-- SIP T2 Interval. RFC 3261 T2 value. The maximum retransmit interval for non-INVITE requests and INVITE responses. -->    
-		<!-- 200 - 2 sec, 400 - 4 sec, 800 - 8 sec, 1600 - 16 sec, 3200 - 32 sec. Default 400. -->    
+		<!-- SIP T2 Interval. RFC 3261 T2 value. The maximum retransmit interval for non-INVITE requests and INVITE responses. -->
+		<!-- 200 - 2 sec, 400 - 4 sec, 800 - 8 sec, 1600 - 16 sec, 3200 - 32 sec. Default 400. -->
 		<P441>400</P441>
-		<!-- DTMF Payload Type -->    
+		<!-- DTMF Payload Type -->
 		<P779>101</P779>
-		<!-- Preferred DTMF method.  -->    
-		<!-- 100 - In-audio, 101 - RFC2833, 102 - SIP INFO -->    
-		<!-- Priority 1 -->    
+		<!-- Preferred DTMF method.  -->
+		<!-- 100 - In-audio, 101 - RFC2833, 102 - SIP INFO -->
+		<!-- Priority 1 -->
 		<P860>100</P860>
-		<!-- Priority 2 -->    
+		<!-- Priority 2 -->
 		<P861>100</P861>
-		<!-- Priority 3 -->    
+		<!-- Priority 3 -->
 		<P862>100</P862>
-		<!-- Disable DTMF Negotiation. 0 - No, 1 - Yes  -->    
+		<!-- Disable DTMF Negotiation. 0 - No, 1 - Yes  -->
 		<P4826>0</P4826>	
-		<!-- Send Hook Flash Event. 0 - No, 1 - Yes  -->    
+		<!-- Send Hook Flash Event. 0 - No, 1 - Yes  -->
 		<P774>0</P774>
-		<!-- Enable Call Features. 0 - No, 1 - Yes  -->    
+		<!-- Enable Call Features. 0 - No, 1 - Yes  -->
 		<P751>1</P751>
-		<!-- Proxy-Require -->     
+		<!-- Proxy-Require -->
 		<P792></P792>
-		<!-- Use NAT IP (used in SIP/SDP message if specified) -->    
+		<!-- Use NAT IP (used in SIP/SDP message if specified) -->
 		<P866></P866>
-		<!-- Use SIP User-Agent Header -->    
+		<!-- Use SIP User-Agent Header -->
 		<P4835></P4835>
-		<!-- Ring Timeout. (10-300, default is 60 seconds) -->    
+		<!-- Ring Timeout. (10-300, default is 60 seconds) -->
 		<P816>60</P816>
-		<!-- Hunting Group Ring Timeout. (5-300, default is 20 seconds) -->    
+		<!-- Hunting Group Ring Timeout. (5-300, default is 20 seconds) -->
 		<P4331>20</P4331>
-		<!-- Hunting Group Type. 1 - Linear, 2 - Parallel, 3 - Shared Line -->    
+		<!-- Hunting Group Type. 1 - Linear, 2 - Parallel, 3 - Shared Line -->
 		<P4396>1</P4396>
-		<!-- Delayed Call Forward Wait Time. Allowed range 1-120, in seconds. Default 20 seconds. -->    
+		<!-- Delayed Call Forward Wait Time. Allowed range 1-120, in seconds. Default 20 seconds. -->
 		<P470>20</P470>
-		<!-- No Key Entry Timeout. Default - 4 seconds. -->    
+		<!-- No Key Entry Timeout. Default - 4 seconds. -->
 		<P292>4</P292>
-		<!-- Early Dial. 0 - No, 1 - Yes (use "Yes" only if proxy supports 484 response) -->    
+		<!-- Early Dial. 0 - No, 1 - Yes (use "Yes" only if proxy supports 484 response) -->
 		<P729>0</P729>	
-		<!-- Dial Plan Prefix.(this prefix string is added to each dialed number) -->    
+		<!-- Dial Plan Prefix.(this prefix string is added to each dialed number) -->
 		<P766></P766>
-		<!-- Use # as Dial Key. 0 - No, 1 - Yes (if set to Yes, "#" will function as the "(Re-)Dial" key) -->    
+		<!-- Use # as Dial Key. 0 - No, 1 - Yes (if set to Yes, "#" will function as the "(Re-)Dial" key) -->
 		<P772>1</P772>
-		<!-- Dial Plan  -->    
-		<P4201>{ x+ | *x+ | *xx*x+}</P4201>   
-		<!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->    
+		<!-- Dial Plan  -->
+		<P4201>{ x+ | *x+ | *xx*x+}</P4201>
+		<!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
 		<P709>0</P709>
-		<!-- Send Anonymous. 0 - No, 1 - Yes  (caller ID will be blocked if set to Yes) -->    
+		<!-- Send Anonymous. 0 - No, 1 - Yes  (caller ID will be blocked if set to Yes) -->
 		<P765>0</P765>
-		<!-- Disable Call-Waiting. 0 - No, 1 - Yes -->    
+		<!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 		<P791>0</P791>
-		<!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->    
+		<!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->
 		<P823>0</P823>
-		<!-- Disable Reminder Ring for On-Hold Call. 0 - No, 1 - Yes -->    
+		<!-- Disable Reminder Ring for On-Hold Call. 0 - No, 1 - Yes -->
 		<P4361>0</P4361>
-		<!-- Anonymous Call Rejection. 0 - No, 1 - Yes. -->    
+		<!-- Anonymous Call Rejection. 0 - No, 1 - Yes. -->
 		<P446>0</P446>
-		<!-- Session Expiration (in seconds. default 180 seconds. Allowed value: 90-65535) -->    
+		<!-- Session Expiration (in seconds. default 180 seconds. Allowed value: 90-65535) -->
 		<P434>180</P434>
-		<!-- Minimum SE (in seconds. default 90 seconds, must be lower than or equal to P260) -->    
+		<!-- Minimum SE (in seconds. default 90 seconds, must be lower than or equal to P260) -->
 		<P427>90</P427>
-		<!-- Caller Request Timer (Request for timer when calling) 0 - No, 1 - Yes -->    
+		<!-- Caller Request Timer (Request for timer when calling) 0 - No, 1 - Yes -->
 		<P428>0</P428>
-		<!-- Callee Request Timer (Request for timer when called. i.e. if remote party supports timer but did not request for one) 0 - No, 1 - Yes -->    
+		<!-- Callee Request Timer (Request for timer when called. i.e. if remote party supports timer but did not request for one) 0 - No, 1 - Yes -->
 		<P429>0</P429>
-		<!-- Force Timer (Still use timer when remote party does not support timer) 0 - No, 1 - Yes -->    
+		<!-- Force Timer (Still use timer when remote party does not support timer) 0 - No, 1 - Yes -->
 		<P430>0</P430>
-		<!-- UAC Specify Refresher. 0 - omit, 1 - UAC, 2 - UAS -->    
+		<!-- UAC Specify Refresher. 0 - omit, 1 - UAC, 2 - UAS -->
 		<P432>0</P432>
-		<!-- UAS Specify Refresher. 1 - UAC, 2 - UAS -->    
+		<!-- UAS Specify Refresher. 1 - UAC, 2 - UAS -->
 		<P433>1</P433>
-		<!-- Force INVITE (Always refresh with INVITE instead of UPDATE even when remote party supports UPDATE) 0 - No, 1 - Yes -->    
+		<!-- Force INVITE (Always refresh with INVITE instead of UPDATE even when remote party supports UPDATE) 0 - No, 1 - Yes -->
 		<P431>0</P431>
-		<!-- Enable 100rel. 0 - No, 1 - Yes -->    
+		<!-- Enable 100rel. 0 - No, 1 - Yes -->
 		<P435>0</P435>
 
-	<!-- Codec/Voice Quality settings  -->                                
-		<!-- Preferred Vocoder -->    
-		<!-- 0 - PCMU, 8 - PCMA, 4 - G.723, 18 - G.729, 2 - G.726-32, 98 - iLBC -->    
-		<!-- Choice 1. -->     
+	<!-- Codec/Voice Quality settings  -->
+		<!-- Preferred Vocoder -->
+		<!-- 0 - PCMU, 8 - PCMA, 4 - G.723, 18 - G.729, 2 - G.726-32, 98 - iLBC -->
+		<!-- Choice 1. -->
 		<P757>0</P757>
-		<!-- Choice 2. -->     
+		<!-- Choice 2. -->
 		<P758>8</P758>
-		<!-- Choice 3. -->     
+		<!-- Choice 3. -->
 		<P759>4</P759>
-		<!-- Choice 4. -->     
+		<!-- Choice 4. -->
 		<P760>18</P760>
-		<!-- Choice 5. -->     
+		<!-- Choice 5. -->
 		<P761>2</P761>
-		<!-- Choice 6. -->     
+		<!-- Choice 6. -->
 		<P762>98</P762>
-		<!-- VAD. 0 - No, 1 - Yes  -->    
+		<!-- VAD. 0 - No, 1 - Yes  -->
 		<P750>0</P750>
-		<!-- Jitter buffer type.  0 - Fixed, 1 - Adaptive -->    
+		<!-- Jitter buffer type.  0 - Fixed, 1 - Adaptive -->
 		<P831>1</P831>
-		<!-- Jitter buffer length. 0 - Low, 1 - Medium, 2 - High -->    
+		<!-- Jitter buffer length. 0 - Low, 1 - Medium, 2 - High -->
 		<P832>1</P832>
-		<!-- SRTP Mode -->    
-		<!-- 0 = Disabled -->    
-		<!-- 1 = Enabled but not forced -->    
-		<!-- 2 = Enabled and forced -->    
+		<!-- SRTP Mode -->
+		<!-- 0 = Disabled -->
+		<!-- 1 = Enabled but not forced -->
+		<!-- 2 = Enabled and forced -->
 		<P443>0</P443>
-		<!-- G723 rate. 0 - 6.3kbps encoding rate, 1 - 5.3kbps encoding rate -->    
+		<!-- G723 rate. 0 - 6.3kbps encoding rate, 1 - 5.3kbps encoding rate -->
 		<P749>0</P749>
-		<!-- Use First Matching Vocoder in 200OK SDP. 0 - No, 1 - Yes -->    
+		<!-- Use First Matching Vocoder in 200OK SDP. 0 - No, 1 - Yes -->
 		<P4364>0</P4364>
-		<!-- iLBC Frame Size. 0 - 20ms(default), 1 - 30ms. -->    
+		<!-- iLBC Frame Size. 0 - 20ms(default), 1 - 30ms. -->
 		<P705>0</P705>
-		<!-- iLBC payload type. (between 96 and 127, default is 97). -->    
+		<!-- iLBC payload type. (between 96 and 127, default is 97). -->
 		<P704>97</P704>
-		<!--Voice Frames per Packet. (up to 10/20/32/64 for G711/G726/G723/other codecs respectively) -->     
+		<!--Voice Frames per Packet. (up to 10/20/32/64 for G711/G726/G723/other codecs respectively) -->
 		<P737>2</P737>
-		<!-- Symmetric RTP. 0 - No, 1 - Yes -->    
+		<!-- Symmetric RTP. 0 - No, 1 - Yes -->
 		<P460>0</P460>
 
-	<!--Handsets -->    
-	<!-- Handset 1 -->    
-		<!-- Enable Handset -->    
+	<!--Handsets -->
+	<!-- Handset 1 -->
+		<!-- Enable Handset -->
 		<P4595>1</P4595>
-		<!-- Hunting Group (0 - None, 1 - Active, 2 - 2, 3 - 3, 4 -4, 5 -5) -->    
+		<!-- Hunting Group (0 - None, 1 - Active, 2 - 2, 3 - 3, 4 -4, 5 -5) -->
 		<P4300>0</P4300>
-		<!--SIP User ID -->    
+		<!--SIP User ID -->
 		<P4060>{$user_id_1}</P4060>
-		<!--Authenticate ID -->    
+		<!--Authenticate ID -->
 		<P4090>{$user_id_1}</P4090>
-		<!--Authenticate Password -->    
+		<!--Authenticate Password -->
 		<P4120>{$user_password_1}</P4120>
-		<!--Name -->    
+		<!--Name -->
 		<P4180>{$display_name_1}</P4180>
-		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->    
+		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->
 		<P4150>0</P4150>
-	<!-- Handset 2 -->    
-		<!-- Enable Handset -->    
+	<!-- Handset 2 -->
+		<!-- Enable Handset -->
 		<P4596>1</P4596>
-		<!-- Hunting Group (0 - None, 2 - Active, 1 - 1, 3 - 3, 4 -4, 5 -5) -->    
+		<!-- Hunting Group (0 - None, 2 - Active, 1 - 1, 3 - 3, 4 -4, 5 -5) -->
 		<P4301>0</P4301>
-		<!--SIP User ID -->    
+		<!--SIP User ID -->
 		<P4061>{$user_id_2}</P4061>
-		<!--Authenticate ID -->    
-		<P4091>{$user_id_2}</P4091>  
-		<!--Authenticate Password -->    
+		<!--Authenticate ID -->
+		<P4091>{$user_id_2}</P4091>
+		<!--Authenticate Password -->
 		<P4121>{$user_password_2}</P4121>
-		<!--Name -->    
+		<!--Name -->
 		<P4181>{$display_name_2}</P4181>
-		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->    
+		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->
 		<P4151>0</P4151>
-	<!-- Handset 3 -->    
-		<!-- Enable Handset -->    
+	<!-- Handset 3 -->
+		<!-- Enable Handset -->
 		<P4597>1</P4597>
-		<!-- Hunting Group (0 - None, 3 - Active, 1 - 1, 2 - 2, 4 -4, 5 -5) -->    
+		<!-- Hunting Group (0 - None, 3 - Active, 1 - 1, 2 - 2, 4 -4, 5 -5) -->
 		<P4302>0</P4302>
-		<!--SIP User ID -->    
+		<!--SIP User ID -->
 		<P4062>{$user_id_3}</P4062>
-		<!--Authenticate ID -->    
+		<!--Authenticate ID -->
 		<P4092>{$user_id_3}</P4092>
-		<!--Authenticate Password -->    
+		<!--Authenticate Password -->
 		<P4122>{$user_password_3}</P4122>
-		<!--Name -->    
+		<!--Name -->
 		<P4182>{$display_name_3}</P4182>
-		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->    
+		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->
 		<P4152>0</P4152>
-	<!-- Handset 4 -->    
+	<!-- Handset 4 -->
 		<!-- Enable Handset -->
 		<P45958>1</P45958>
-		<!-- Hunting Group (0 - None, 4 - Active, 1 -1, 2 -2, 3 -3, 5 -5) -->    
+		<!-- Hunting Group (0 - None, 4 - Active, 1 -1, 2 -2, 3 -3, 5 -5) -->
 		<P4303>0</P4303>
-		<!--SIP User ID -->    
+		<!--SIP User ID -->
 		<P4063>{$user_id_4}</P4063>
-		<!--Authenticate ID -->    
+		<!--Authenticate ID -->
 		<P4093>{$user_id_4}</P4093>
-		<!--Authenticate Password -->    
-		<P4123>{$user_password_4}</P4123> 
-		<!-- Name -->    
+		<!--Authenticate Password -->
+		<P4123>{$user_password_4}</P4123>
+		<!-- Name -->
 		<P4183>{$display_name_4}</P4183>
-		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->    
+		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->
 		<P4153>0</P4153>
-	<!-- Handset 5 -->    
-		<!-- Enable Handset -->    
+	<!-- Handset 5 -->
+		<!-- Enable Handset -->
 		<P4599>1</P4599>
-		<!-- Hunting Group (0 - None, 5 - Active, 1 -1, 2 -2, 3 -3, 4 -4) -->    
+		<!-- Hunting Group (0 - None, 5 - Active, 1 -1, 2 -2, 3 -3, 4 -4) -->
 		<P4304>0</P4304>
-		<!--SIP User ID -->    
+		<!--SIP User ID -->
 		<P4064>{$user_id_5}</P4064>
-		<!--Authenticate ID -->    
-		<P4094>{$user_id_5}</P4094> 
-		<!--Authenticate Password -->    
-		<P4124>{$user_password_5}</P4124>  
-		<!--Name -->    
-		<P4184>{$display_name_5}</P4184> 
-		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->    
+		<!--Authenticate ID -->
+		<P4094>{$user_id_5}</P4094>
+		<!--Authenticate Password -->
+		<P4124>{$user_password_5}</P4124>
+		<!--Name -->
+		<P4184>{$display_name_5}</P4184>
+		<!--Profile ID (0 - Profile 1, 1 - Profile 2) -->
 		<P4154>0</P4154>
 
-	<!--  Basic Settings. -->                                                          
-		<!-- End User Password -->    
-		<P196>123</P196>
-		<!-- Web Port. Default HTTP is 80. -->    
+	<!--  Basic Settings. -->
+		<!-- End User Password, MaxLength 32 -->
+		<P196>{$user_password}</P196>
+		<!-- Web Port. Default HTTP is 80. -->
 		<P901>80</P901>
-		<!-- Telnet Server. 1 - No, 0 - Yes -->    
+		<!-- Telnet Server. 1 - No, 0 - Yes -->
 		<P276>0</P276>
-		<!-- IP Address. 0 - DHCP, 2 - PPPoE, 1 - Static IP -->    
+		<!-- IP Address. 0 - DHCP, 2 - PPPoE, 1 - Static IP -->
 		<P8>0</P8>
-	<!-- DHCP -->    
-		<!-- DHCP Hostname, DHCP option 12. Max length allowed is 32 bytes. -->    
+	<!-- DHCP -->
+		<!-- DHCP Hostname, DHCP option 12. Max length allowed is 32 bytes. -->
 		<P146></P146>
-		<!-- DHCP Domain Name, DHCP option 15. Max length allowed is 32 bytes. -->    
+		<!-- DHCP Domain Name, DHCP option 15. Max length allowed is 32 bytes. -->
 		<P147></P147>
-		<!-- DHCP Vendor Class ID, DHCP option 60. Max length allowed is 32 bytes. -->    
+		<!-- DHCP Vendor Class ID, DHCP option 60. Max length allowed is 32 bytes. -->
 		<P148>DP7XX</P148>
-	<!-- PPPoE -->    
-		<!-- PPPoE account ID -->    
-		<!--P82= -->    
-		<!-- PPPoE password -->    
-		<!--P83= -->    
-		<!-- PPPoE Service Name -->    
-		<!--P269= -->        
-		<!-- Preferred DNS server -->    
-		<!--P92=0 -->    
-		<!--P93=0 -->    
-		<!--P94=0 -->    
-		<!--P95=0 -->    
+	<!-- PPPoE -->
+		<!-- PPPoE account ID -->
+		<!--P82= -->
+		<!-- PPPoE password -->
+		<!--P83= -->
+		<!-- PPPoE Service Name -->
+		<!--P269= -->
+		<!-- Preferred DNS server -->
+		<!--P92=0 -->
+		<!--P93=0 -->
+		<!--P94=0 -->
+		<!--P95=0 -->
 	<!-- Static IP -->
-		<!-- IP Address. Ignore if DHCP or PPPoE is used -->    
-		<!--P9=192 -->    
-		<!--P10=168 -->    
-		<!--P11=0 -->    
-		<!--P12=160 -->    
-		<!-- Subnet mask. Ignore if DHCP or PPPoE is used -->    
-		<!--P13=255 -->    
-		<!--P14=255 -->    
-		<!--P15=255 -->    
-		<!--P16=0 -->    
-		<!-- Default Router. Ignore if DHCP or PPPoE is used -->    
-		<!--P17=0 -->    
-		<!--P18=0 -->    
-		<!--P19=0 -->    
-		<!--P20=0 -->    
-		<!-- DNS 1. Ignore if DHCP or PPPoE is used -->    
-		<!--P21=0 -->    
-		<!--P22=0 -->    
-		<!--P23=0 -->    
-		<!--P24=0 -->    
-		<!-- DNS 2. Ignore if DHCP or PPPoE is used -->    
-		<!--P25=0 -->    
-		<!--P26=0 -->    
-		<!--P27=0 -->    
-		<!--P28=0 -->    
+		<!-- IP Address. Ignore if DHCP or PPPoE is used -->
+		<!--P9=192 -->
+		<!--P10=168 -->
+		<!--P11=0 -->
+		<!--P12=160 -->
+		<!-- Subnet mask. Ignore if DHCP or PPPoE is used -->
+		<!--P13=255 -->
+		<!--P14=255 -->
+		<!--P15=255 -->
+		<!--P16=0 -->
+		<!-- Default Router. Ignore if DHCP or PPPoE is used -->
+		<!--P17=0 -->
+		<!--P18=0 -->
+		<!--P19=0 -->
+		<!--P20=0 -->
+		<!-- DNS 1. Ignore if DHCP or PPPoE is used -->
+		<!--P21=0 -->
+		<!--P22=0 -->
+		<!--P23=0 -->
+		<!--P24=0 -->
+		<!-- DNS 2. Ignore if DHCP or PPPoE is used -->
+		<!--P25=0 -->
+		<!--P26=0 -->
+		<!--P27=0 -->
+		<!--P28=0 -->
 
-	<!--Time Zone. Offset in minutes to GMT -->    
-		<!-- <value="TZA+12"> GMT-12:00 (International Date Line West) -->    
-		<!-- <value="TZB+11"> GMT-11:00 (Midway Island, Samoa) -->    
-		<!-- <value="HAW10"> GMT-10:00 (US Hawaiian Time) -->    
-		<!-- <value="AKST9AKDT"> GMT-09:00 (US Alaska Time) -->    
-		<!-- <value="PST8PDT"> Geles) -->    
-		<!-- <value="PST8PDT,M4.1.0,M10.5.0"> GMT-08:00 (Baja California) -->    
-		<!-- <value="MST7MDT"> GMT-07:00 (US Mountain Time, Denver) -->    
-		<!-- <value="MST7"> GMT-07:00 (Mountain Time (Arizona, no DST)) -->    
-		<!-- <value="MST7MDT,M4.1.0,M10.5.0"> GMT-07:00 (Chihuahua, La Paz, Mazatlan) -->    
-		<!-- <value="CST6CDT"> GMT-06:00 (Central Time) -->    
-		<!-- <value="CST+6"> GMT-06:00 (Central America) -->    
-		<!-- <value="CST6CDT,M4.1.0,M10.5.0"> Guadalajara, Mexico City, Monterrey) -->    
-		<!-- <value="EST5EDT"> GMT-05:00 (Eastern Time) -->    
-		<!-- <value="EST5"> G) -->    
-		<!-- <value="TZf+4:30"> GMT-04:30 (Caracas) -->    
-		<!-- <value="AST4ADT"> GMT-04:00 (Atlantic Time) -->    
-		<!-- <value="AST4ADT,M4.1.0/00:01:00,M10.5.0/00:01:00"> GMT-04:00 (Atlantic Time (New Brunswick)) -->    
-		<!-- <value="NST+3:30NDT+2:30,M4.1.0/00:01:00,M10.5.0/00:01:00"> GMT-03:30 (Newfoundland Time) -->    
-		<!-- <value="TZK+3"> Greenland) -->    
-		<!-- <value="BRST+3BRDT+2,M10.3.0,M2.3.0"> GMT-03:00 (Brazil, Sao Paulo) -->    
-		<!-- <value="UTC+3"> Gentina) -->    
-		<!-- <value="TZL+2"> GMT-02:00 (Mid-Atlantic) -->    
-		<!-- <value="TZM+1"> GMT-01:00 (Azores, Cape Verde Is.) -->    
-		<!-- <value="TZN+0"> Gh, Casablanca, Monrovia) -->    
-		<!-- <value="GMT+0BST-1,M3.5.0/01:00:00,M10.5.0/02:00:00"> Great Britain) -->    
-		<!-- <value="WET-0WEST-1,M3.5.0/01:00:00,M10.5.0/02:00:00"> Gal) -->    
+	<!--Time Zone. Offset in minutes to GMT -->
+		<!-- <value="TZA+12"> GMT-12:00 (International Date Line West) -->
+		<!-- <value="TZB+11"> GMT-11:00 (Midway Island, Samoa) -->
+		<!-- <value="HAW10"> GMT-10:00 (US Hawaiian Time) -->
+		<!-- <value="AKST9AKDT"> GMT-09:00 (US Alaska Time) -->
+		<!-- <value="PST8PDT"> Geles) -->
+		<!-- <value="PST8PDT,M4.1.0,M10.5.0"> GMT-08:00 (Baja California) -->
+		<!-- <value="MST7MDT"> GMT-07:00 (US Mountain Time, Denver) -->
+		<!-- <value="MST7"> GMT-07:00 (Mountain Time (Arizona, no DST)) -->
+		<!-- <value="MST7MDT,M4.1.0,M10.5.0"> GMT-07:00 (Chihuahua, La Paz, Mazatlan) -->
+		<!-- <value="CST6CDT"> GMT-06:00 (Central Time) -->
+		<!-- <value="CST+6"> GMT-06:00 (Central America) -->
+		<!-- <value="CST6CDT,M4.1.0,M10.5.0"> Guadalajara, Mexico City, Monterrey) -->
+		<!-- <value="EST5EDT"> GMT-05:00 (Eastern Time) -->
+		<!-- <value="EST5"> G) -->
+		<!-- <value="TZf+4:30"> GMT-04:30 (Caracas) -->
+		<!-- <value="AST4ADT"> GMT-04:00 (Atlantic Time) -->
+		<!-- <value="AST4ADT,M4.1.0/00:01:00,M10.5.0/00:01:00"> GMT-04:00 (Atlantic Time (New Brunswick)) -->
+		<!-- <value="NST+3:30NDT+2:30,M4.1.0/00:01:00,M10.5.0/00:01:00"> GMT-03:30 (Newfoundland Time) -->
+		<!-- <value="TZK+3"> Greenland) -->
+		<!-- <value="BRST+3BRDT+2,M10.3.0,M2.3.0"> GMT-03:00 (Brazil, Sao Paulo) -->
+		<!-- <value="UTC+3"> Gentina) -->
+		<!-- <value="TZL+2"> GMT-02:00 (Mid-Atlantic) -->
+		<!-- <value="TZM+1"> GMT-01:00 (Azores, Cape Verde Is.) -->
+		<!-- <value="TZN+0"> Gh, Casablanca, Monrovia) -->
+		<!-- <value="GMT+0BST-1,M3.5.0/01:00:00,M10.5.0/02:00:00"> Great Britain) -->
+		<!-- <value="WET-0WEST-1,M3.5.0/01:00:00,M10.5.0/02:00:00"> Gal) -->
 		<!-- <value="GMT+0IST-1,M3.5.0/01:00:00,M10.5.0/02:00:00"> GMT (Dublin, Ireland) -->    		
-		<!-- <value="TZO-1"> Gium, Brussels, Paris, Vienna, Warsaw) -->    
-		<!-- <value="CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00"> Gue, Berlin, Budapest, Amsterdam, Barcelona) -->    
-		<!-- <value="TZP-2"> GMT+02:00 (Israel, Cairo, Athens, Istanbul, Bucharest) -->    
-		<!-- <value="EET-2EEST-3,M3.5.0/03:00:00,M10.5.0/04:00:00"> GMT+02:00 (Helsinki, Athens, Tallinn) -->    
-		<!-- <value="EET-2EEST,M3.5.0/3,M10.5.0/4"> GMT+02:00 (Kyiv, Ukraine) -->    
-		<!-- <value="TZQ-3"> Ghdad, Tehran, Nairobi) -->    
-		<!-- <value="MSK-3MSD,M3.5.0/2,M10.5.0/3"> GMT+03:00 (Moscow, Russia) -->    
-		<!-- <value="MST-3MDT,M3.5.0/2,M10.5.0/3"> G, Russia) -->    
-		<!-- <value="TZR-4"> GMT+04:00 (Abu Dhabi, Baku) -->    
-		<!-- <value="TZS-5"> G, Karachi, Tashkent) -->    
-		<!-- <value="TZT-5:30"> GMT+05:30 (Chennai, New Delhi, Mumbai) -->    
-		<!-- <value="TZU-5:45"> GMT+05:45 (Kathmandu) -->    
-		<!-- <value="TZV-6"> GMT+06:00 (Almaty, Astana, Dhaka, Novosibirsk) -->    
-		<!-- <value="TZW-6:30"> Goon) -->    
-		<!-- <value="TZX-7"> GMT+07:00 (Bankok, Hanoi, Krasnoyarsk) -->    
-		<!-- <value="WIB-7"> GMT+07:00 (Jakarta) -->    
-		<!-- <value="TZY-8"> G, Taipei, Kuala Lumpur, Irkutsk) -->    
-		<!-- <value="SGT-8"> Gapore) -->    
-		<!-- <value="ULAT-8"> Golia) -->    
+		<!-- <value="TZO-1"> Gium, Brussels, Paris, Vienna, Warsaw) -->
+		<!-- <value="CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00"> Gue, Berlin, Budapest, Amsterdam, Barcelona) -->
+		<!-- <value="TZP-2"> GMT+02:00 (Israel, Cairo, Athens, Istanbul, Bucharest) -->
+		<!-- <value="EET-2EEST-3,M3.5.0/03:00:00,M10.5.0/04:00:00"> GMT+02:00 (Helsinki, Athens, Tallinn) -->
+		<!-- <value="EET-2EEST,M3.5.0/3,M10.5.0/4"> GMT+02:00 (Kyiv, Ukraine) -->
+		<!-- <value="TZQ-3"> Ghdad, Tehran, Nairobi) -->
+		<!-- <value="MSK-3MSD,M3.5.0/2,M10.5.0/3"> GMT+03:00 (Moscow, Russia) -->
+		<!-- <value="MST-3MDT,M3.5.0/2,M10.5.0/3"> G, Russia) -->
+		<!-- <value="TZR-4"> GMT+04:00 (Abu Dhabi, Baku) -->
+		<!-- <value="TZS-5"> G, Karachi, Tashkent) -->
+		<!-- <value="TZT-5:30"> GMT+05:30 (Chennai, New Delhi, Mumbai) -->
+		<!-- <value="TZU-5:45"> GMT+05:45 (Kathmandu) -->
+		<!-- <value="TZV-6"> GMT+06:00 (Almaty, Astana, Dhaka, Novosibirsk) -->
+		<!-- <value="TZW-6:30"> Goon) -->
+		<!-- <value="TZX-7"> GMT+07:00 (Bankok, Hanoi, Krasnoyarsk) -->
+		<!-- <value="WIB-7"> GMT+07:00 (Jakarta) -->
+		<!-- <value="TZY-8"> G, Taipei, Kuala Lumpur, Irkutsk) -->
+		<!-- <value="SGT-8"> Gapore) -->
+		<!-- <value="ULAT-8"> Golia) -->
 		<!-- <value="WST-8"> GMT+08:00 (Perth) -->    		
-		<!-- <value="TZZ-9"> GMT+09:00 (Japan, Korea, Yakutsk) -->    
-		<!-- <value="CST-9:30CDT-10:30,M10.5.0/02:00:00,M3.5.0/03:00:00"> GMT+09:30 (Adelaide) -->    
-		<!-- <value="CST-9:30"> GMT+09:30 (Darwin) -->    
-		<!-- <value="TZb-10"> Guam) -->    
-		<!-- <value="EST-10EDT-11,M10.1.0/02:00:00,M3.5.0/03:00:00"> GMT+10:00 (Hobart) -->    
-		<!-- <value="EST-10EDT-11,M10.5.0/02:00:00,M3.5.0/03:00:00"> GMT+10:00 (Sydney, Melbourne, Canberra) -->    
-		<!-- <value="EST-10"> GMT+10:00 (Brisbane) -->    
-		<!-- <value="TZc-11"> Gadan, Solomon Is., New Caledonia) -->    
-		<!-- <value="NZST-12NZDT-13,M10.1.0/02:00:00,M3.3.0/03:00:00"> Gton) -->    
-		<!-- <value="TZd-12"> GMT+12:00 (Fiji) -->    
-		<!-- <value="TZe-13"> GMT+13:00 (Nuku'alofa) -->    
-		<!-- <value="customize" selected=""> G self-defined Time Zone -->    
-		<P64>customize</P64> -->    
-		<!-- Self-Defined Time Zone -->    
+		<!-- <value="TZZ-9"> GMT+09:00 (Japan, Korea, Yakutsk) -->
+		<!-- <value="CST-9:30CDT-10:30,M10.5.0/02:00:00,M3.5.0/03:00:00"> GMT+09:30 (Adelaide) -->
+		<!-- <value="CST-9:30"> GMT+09:30 (Darwin) -->
+		<!-- <value="TZb-10"> Guam) -->
+		<!-- <value="EST-10EDT-11,M10.1.0/02:00:00,M3.5.0/03:00:00"> GMT+10:00 (Hobart) -->
+		<!-- <value="EST-10EDT-11,M10.5.0/02:00:00,M3.5.0/03:00:00"> GMT+10:00 (Sydney, Melbourne, Canberra) -->
+		<!-- <value="EST-10"> GMT+10:00 (Brisbane) -->
+		<!-- <value="TZc-11"> Gadan, Solomon Is., New Caledonia) -->
+		<!-- <value="NZST-12NZDT-13,M10.1.0/02:00:00,M3.3.0/03:00:00"> Gton) -->
+		<!-- <value="TZd-12"> GMT+12:00 (Fiji) -->
+		<!-- <value="TZe-13"> GMT+13:00 (Nuku'alofa) -->
+		<!-- <value="customize" selected=""> G self-defined Time Zone -->
+		<P64>customize</P64> -->
+		<!-- Self-Defined Time Zone -->
 		<P246>MTZ+6MDT+5,M3.2.0,M11.1.0</P246>
-		<!-- Allow DHCP server to set Time Zone. 0 - No, 1 - Yes -->    
+		<!-- Allow DHCP server to set Time Zone. 0 - No, 1 - Yes -->
 		<P143>0</P143>
 
-		<!-- Language. 0 - English, 10 - Spanish IVR -->    
+		<!-- Language. 0 - English, 10 - Spanish IVR -->
 		<P342>0</P342>
 		
 	</config>
diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
index e03fff0343..8ab14b3527 100644
--- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
@@ -885,11 +885,11 @@
 
 <!-- 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>
+<P2>{$admin_password}</P2>
 
 
 <!--Maintenance/Upgrade and Provisioning -->
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index a7100108f7..30581c7da4 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -757,11 +757,11 @@
 
 <!--  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>
+<P2>{$admin_password}</P2>
 
 
 
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index d36c34bea5..8d685092e8 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1138,10 +1138,10 @@
     <P276>0</P276>
     <!--  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>
+    <P2>{$admin_password}</P2>
     <!--   Maintenance/Upgrade and Provisioning -->
     <!--  Firmware Upgrade and Provisioning -->
     <!--  0 - Always Check For New Firmware -->
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index 54d644ec84..52094924c4 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -1138,10 +1138,10 @@
     <P276>0</P276>
     <!--  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>
+    <P2>{$admin_password}</P2>
     <!--   Maintenance/Upgrade and Provisioning -->
     <!--  Firmware Upgrade and Provisioning -->
     <!--  0 - Always Check For New Firmware -->
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index 004978e4d9..f9f042f407 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -1511,11 +1511,11 @@
 
 <!-- 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> 
+<P2>{$admin_password}</P2> 
 
 
 
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index 5e0f6ef61e..47d560bb54 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -1320,11 +1320,11 @@
 
 <!-- End User Password --> 
 <!-- String: a-z, A-Z, 0-9 --> 
-<P196>123</P196> 
+<P196>{$user_password}</P196> 
 
 <!-- Admin password for web interface --> 
 <!-- String: a-z, A-Z, 0-9 --> 
-<P2>admin</P2> 
+<P2>{$admin_password}</P2> 
 
 
 
diff --git a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
index 6bd6f34ba3..b72e7accb5 100644
--- a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
@@ -4,13 +4,10 @@
 
 <!-- Configuration template for GXP2000/GXP2020/GXP1200/GXP2010/GXP280/GXP285 firmware version 1.2.5.3 -->
 
-
-
 <!-- Advanced/System-wide Options -->
 
-
 <!--  Admin password for web interface -->
-<P2>admin</P2>
+<P2>{$admin_password}</P2>
 
 <!--  G723 rate. 0 - 6.3kbps encoding rate, 1 - 5.3kbps encoding rate -->
 <P49>0</P49>
@@ -1577,7 +1574,7 @@
 
 
 <!--  End User Password -->
-<P196>123</P196>
+<P196>{$user_password}</P196>
 
 <!--  DHCP support. 0 - yes, 1 - no -->
 <!-- P8 = 0 -->
@@ -3360,190 +3357,5 @@
 <!--  UserID  -->
 <P6699></P6699>
 
-<!--  EXT Key 100  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6100></P6100>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6300></P6300>
-
-<!--  Name  -->
-<P6500></P6500>
-
-<!--  UserID  -->
-<P6700></P6700>
-
-<!--  EXT Key 101  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6101></P6101>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6301></P6301>
-
-<!--  Name  -->
-<P6501></P6501>
-
-<!--  UserID  -->
-<P6701></P6701>
-
-<!--  EXT Key 102  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6102></P6102>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6302></P6302>
-
-<!--  Name  -->
-<P6502></P6502>
-
-<!--  UserID  -->
-<P6702></P6702>
-
-<!--  EXT Key 103  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6103></P6103>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6303></P6303>
-
-<!--  Name  -->
-<P6503></P6503>
-
-<!--  UserID  -->
-<P6703></P6703>
-
-<!--  EXT Key 104  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6104></P6104>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6304></P6304>
-
-<!--  Name  -->
-<P6504></P6504>  
-
-<!--  UserID  -->
-<P6704></P6704>
-
-<!--  EXT Key 105  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6105></P6105>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6305></P6305>
-
-<!--  Name  -->
-<P6505></P6505>
-
-<!--  UserID  -->
-<P6705></P6705>
-
-<!--  EXT Key 106  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6106></P6106>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6306></P6306>
-
-<!--  Name  -->
-<P6506></P6506>
-
-<!--  UserID  -->
-<P6706></P6706>
-
-<!--  EXT Key 107  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6107></P6107>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6307></P6307>
-
-<!--  Name  -->
-<P6507></P6507>
-
-<!--  UserID  -->
-<P6707></P6707>
-
-<!--  EXT Key 108  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6108></P6108>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6308></P6308>
-
-<!--  Name  -->
-<P6508></P6508>
-
-<!--  UserID  -->
-<P6708></P6708>
-
-<!--  EXT Key 109  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6109></P6109>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4  -->
-<P6309></P6309>
-
-<!--  Name  -->
-<P6509></P6509>
-
-<!--  UserID  -->
-<P6709></P6709>
-
-<!--  EXT Key 110  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6110></P6110>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6310></P6310>
-
-<!--  Name  -->
-<P6510></P6510>
-
-<!--  UserID  -->
-<P6710></P6710>
-
-<!--  EXT Key 111  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6111></P6111>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6311></P6311>
-
-<!--  Name  -->
-<P6511></P6511>
-
-<!--  UserID  -->
-<P6711></P6711>
-
-<!--  EXT Key 112  -->
-
-<!--  Key Mode. 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF  -->
-<P6112></P6112>
-
-<!--  Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4   -->
-<P6312></P6312>
-
-<!--  Name  -->
-<P6512></P6512>
-
-<!--  UserID  -->
-<P6712></P6712>
-
-
 </config>
 </gs_provision>
-
-
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 2a46c0994a..b4aa19efbc 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -1858,10 +1858,10 @@
     <P276>0</P276>
     <!-- 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>
+    <P2>{$admin_password}</P2>
     <!-- Maintenance/Upgrade and Provisioning -->
     <!-- Firmware Upgrade and Provisioning -->
     <!-- 0 - Always Check For New Firmware -->
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 7e32b0ed24..12d2d6c657 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -2648,10 +2648,10 @@
     <!-- Maintenance/ Web Accessv -->
     <!-- End User Password -->
     <!-- String: a-z, A-Z, 0-9 -->
-    <P196>123</P196>
+    <P196>{$user_password}</P196>
     <!-- Admin password for web interface -->
     <!-- String: a-z, A-Z, 0-9 -->
-    <P2>admin</P2>
+    <P2>{$admin_password}</P2>
     <!-- Maintenance/Upgrade and Provisioning -->
     <!-- Firmware Upgrade and Provisioning -->
     <!-- 0 - Always Check For New Firmware -->
@@ -3546,437 +3546,27 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
     <P396></P396>
     <!-- Extension Boards FOR GXP2110 and GXP2120 ONLY -->
     <!-- Extension Board 1 Settings. -->
-    <!-- EXT Key 1 -->
+
+{foreach $keys as $row}
+    <!-- EXT Key {$row.device_key_id} -->
     <!-- Key Mode. -->
     <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
     <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
     <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
     <!-- Number: 0-11 -->
     <!-- Mandatory -->
-    <P6001>0</P6001>
+    <P600{$row.device_key_id}>{$row.device_key_type}</P600{$row.device_key_id}>
     <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
     <!-- Number: 0 - 5 -->
     <!-- Mandatory -->
-    <P6201>0</P6201>
+    <P620{$row.device_key_id}>{$row.device_key_line}</P620{$row.device_key_id}>
     <!-- Name -->
     <!-- String -->
-    <P6401></P6401>
+    <P640{$row.device_key_id}>{$row.device_key_value}</P640{$row.device_key_id}>
     <!-- UserID -->
     <!-- String -->
-    <P6601></P6601>
-    <!-- EXT Key 2 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6002>0</P6002>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6202>0</P6202>
-    <!-- Name -->
-    <!-- String -->
-    <P6402></P6402>
-    <!-- UserID -->
-    <!-- String -->
-    <P6602></P6602>
-    <!-- EXT Key 3 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6003>0</P6003>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6203>0</P6203>
-    <!-- Name -->
-    <!-- String -->
-    <P6403></P6403>
-    <!-- UserID -->
-    <!-- String -->
-    <P6603></P6603>
-    <!-- EXT Key 4 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6004>0</P6004>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6204>0</P6204>
-    <!-- Name -->
-    <!-- String -->
-    <P6404></P6404>
-    <!-- UserID -->
-    <!-- String -->
-    <P6604></P6604>
-    <!-- EXT Key 5 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6005>0</P6005>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6205>0</P6205>
-    <!-- Name -->
-    <!-- String -->
-    <P6405></P6405>
-    <!-- UserID -->
-    <!-- String -->
-    <P6605></P6605>
-    <!-- EXT Key 6 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6006>0</P6006>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6206>0</P6206>
-    <!-- Name -->
-    <!-- String -->
-    <P6406></P6406>
-    <!-- UserID -->
-    <!-- String -->
-    <P6606></P6606>
-    <!-- EXT Key 7 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6007>0</P6007>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6207>0</P6207>
-    <!-- Name -->
-    <!-- String -->
-    <P6407></P6407>
-    <!-- UserID -->
-    <!-- String -->
-    <P6607></P6607>
-    <!-- EXT Key 8 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6008>0</P6008>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6208>0</P6208>
-    <!-- Name -->
-    <!-- String -->
-    <P6408></P6408>
-    <!-- UserID -->
-    <!-- String -->
-    <P6608></P6608>
-    <!-- EXT Key 9 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6009>0</P6009>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6209>0</P6209>
-    <!-- Name -->
-    <!-- String -->
-    <P6409></P6409>
-    <!-- UserID -->
-    <!-- String -->
-    <P6609></P6609>
-    <!-- EXT Key 10 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P601>0</P601>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6210>0</P6210>
-    <!-- Name -->
-    <!-- String -->
-    <P6410></P6410>
-    <!-- UserID -->
-    <!-- String -->
-    <P6610></P6610>
-    <!-- EXT Key 11 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6011>0</P6011>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6211>0</P6211>
-    <!-- Name -->
-    <!-- String -->
-    <P6411></P6411>
-    <!-- UserID -->
-    <!-- String -->
-    <P6611></P6611>
-    <!-- EXT Key 12 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6012>0</P6012>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6212>0</P6212>
-    <!-- Name -->
-    <!-- String -->
-    <P6412></P6412>
-    <!-- UserID -->
-    <!-- String -->
-    <P6612></P6612>
-    <!-- EXT Key 13 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6013>0</P6013>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6213>0</P6213>
-    <!-- Name -->
-    <!-- String -->
-    <P6413></P6413>
-    <!-- UserID -->
-    <!-- String -->
-    <P6613></P6613>
-    <!-- EXT Key 14 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6014>0</P6014>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6214>0</P6214>
-    <!-- Name -->
-    <!-- String -->
-    <P6414></P6414>
-    <!-- UserID -->
-    <!-- String -->
-    <P6614></P6614>
-    <!-- EXT Key 15 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6015>0</P6015>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6215>0</P6215>
-    <!-- Name -->
-    <!-- String -->
-    <P6415></P6415>
-    <!-- UserID -->
-    <!-- String -->
-    <P6615></P6615>
-    <!-- EXT Key 16 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6016>0</P6016>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6216>0</P6216>
-    <!-- Name -->
-    <!-- String -->
-    <P6416></P6416>
-    <!-- UserID -->
-    <!-- String -->
-    <P6616></P6616>
-    <!-- EXT Key 17 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6017>0</P6017>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6217>0</P6217>
-    <!-- Name -->
-    <!-- String -->
-    <P6417></P6417>
-    <!-- UserID -->
-    <!-- String -->
-    <P6617></P6617>
-    <!-- EXT Key 18 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6018>0</P6018>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6218>0</P6218>
-    <!-- Name -->
-    <!-- String -->
-    <P6418></P6418>
-    <!-- UserID -->
-    <!-- String -->
-    <P6618></P6618>
-    <!-- EXT Key 19 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6019>0</P6019>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6219>0</P6219>
-    <!-- Name -->
-    <!-- String -->
-    <P6419></P6419>
-    <!-- UserID -->
-    <!-- String -->
-    <P6619></P6619>
-    <!-- EXT Key 20 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6020>0</P6020>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6220>0</P6220>
-    <!-- Name -->
-    <!-- String -->
-    <P6420></P6420>
-    <!-- UserID -->
-    <!-- String -->
-    <P6620></P6620>
-    <!-- EXT Key 21 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6021>0</P6021>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6221>0</P6221>
-    <!-- Name -->
-    <!-- String -->
-    <P6421></P6421>
-    <!-- UserID -->
-    <!-- String -->
-    <P6621></P6621>
-    <!-- EXT Key 22 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6022>0</P6022>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6222>0</P6222>
-    <!-- Name -->
-    <!-- String -->
-    <P6422></P6422>
-    <!-- UserID -->
-    <!-- String -->
-    <P6622></P6622>
-    <!-- EXT Key 23 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6023>0</P6023>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6223>0</P6223>
-    <!-- Name -->
-    <!-- String -->
-    <P6423></P6423>
-    <!-- UserID -->
-    <!-- String -->
-    <P6623></P6623>
-    <!-- EXT Key 24 -->
-    <!-- Key Mode. -->
-    <!-- 0 - Speed Dial, 1 - BLF, 2 - Presence Watcher, 3 - eventlist BLF -->
-    <!-- 4 - Speed Dial via active account, 5 - DialDTMF, 6 - Voicemail, 7 - CallReturn -->
-    <!-- 8 - Transfer, 9 - CallPark, 10 - Intercom, 11 - LDAP Search -->
-    <!-- Number: 0-11 -->
-    <!-- Mandatory -->
-    <P6024>0</P6024>
-    <!-- Account. 0 - Account 1, 1 - Account 2, 2 - Account 3, 3 - Account 4, 4 - Account 5, 5 - Account 6 -->
-    <!-- Number: 0 - 5 -->
-    <!-- Mandatory -->
-    <P6224>0</P6224>
-    <!-- Name -->
-    <!-- String -->
-    <P6424></P6424>
-    <!-- UserID -->
-    <!-- String -->
-    <P6624></P6624>
+    <P660{$row.device_key_id}>{$row.device_key_extension}</P660{$row.device_key_id}>
+{/foreach}
+
   </config>
 </gs_provision>
\ No newline at end of file
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index f7e44788dc..f5ff448552 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -3331,11 +3331,11 @@
 
 <!-- End User Password -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P196>123</P196>
+<P196>{$user_password}</P196>
 
 <!-- Admin password for web interface -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P2>admin</P2>
+<P2>{$admin_password}</P2>
 
 <!-- Maintenance/Syslog -->
 
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 3e6a910145..81e9f4cd9f 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3182,10 +3182,10 @@ VNumber: 0, 1, 2. -->
 <P901>80</P901>
 
 <!-- Admin password for web interface --> 
-<P2>admin</P2>
+<P2>{$admin_password}</P2>
 
 <!-- End User Password --> 
-<P196>123</P196>
+<P196>{$user_password}</P196>
 
 <!--  Maintenance - Upgrade    -->                                       
 
diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
index dd43e9b9c0..38e320c60b 100644
--- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
@@ -4,7 +4,9 @@
     <!-- Configuration template for GXV-300x firmware version 1.2.3.7 -->
     <!-- Advanced/System-wide Options -->
     <!-- Admin password for web interface, max. length is 30 -->
-    <P2>admin</P2>
+    <P2>{$admin_password}</P2>
+    <!-- End User Password --> 
+    <P196>{$user_password}</P196>
     <!-- G.723 rate: 0 - 6.3kbps encoding rate,  1 - 5.3kbps encoding rate -->
     <P49></P49>
     <!-- Silence Suppression. 0 - no, 1 - yes -->
diff --git a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
index 49a6bb47ba..ecb5bda0ab 100644
--- a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
@@ -1340,11 +1340,11 @@
 <P901>80</P901>
 
 <!--  Admin password for web interface, max. length is 32 -->  
-<P2>admin</P2>
+<P2>{$admin_password}</P2>
 
 <!--  End User Password, MaxLength 32 -->  
 <!-- P196 = 123 -->  
-
+<P196>{$user_password}</P196>
 
 <!--  Maintenance/ Upgrade and Provisioning -->                              
 
diff --git a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
index f4ae365546..e039e13f45 100644
--- a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
@@ -1223,8 +1223,11 @@
 <!-- Web Port: HTTP default is 80 and HTTPS default is 443 -->       
 <P901>80</P901> 
 
-<!-- Admin password for web interface, max. length is 32 -->     
-<P2>admin</P2> 
+<!-- Admin password for web interface, max. length is 30 -->
+<P2>{$admin_password}</P2>
+
+<!-- End User Password --> 
+<P196>{$user_password}</P196>
 
 <!-- End User Password, MaxLength 32 -->     
 <!-- P196 = 123 -->     
diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
index 1ca0f9324f..a568f762f3 100644
--- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
@@ -716,12 +716,12 @@
     <P900>0</P900>
     <!-- Web Port: HTTP default is 80 and HTTPS default is 443 -->
     <P901>80</P901>
-   
+
     <!-- Admin Password for web interface, MaxLength 32 -->
-    <P2>admin</P2>
-   
+    <P2>{$admin_password}</P2>
+
     <!-- End User Password, MaxLength 32 -->
-    <P196>123</P196>
+    <P196>{$user_password}</P196>
    
     <!-- Maintenance/ UPgrade and Provisioning -->
     <!-- Enable Provider Lock. 0 - No, 1 - Yes. -->
diff --git a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
index 4a1134b669..033336ee33 100644
--- a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
@@ -2,70 +2,70 @@
 <gs_provision version="1">
 	<config version="1">
 
-<!-- Configuration template for GXV-3504 firmware version 1.0.4.39 -->                              
-<!--  Home -->                                                                    
-<!-- Basic Settings -->                                                          
-<!-- Basic Settings/System  -->                                          
+<!-- Configuration template for GXV-3504 firmware version 1.0.4.39 -->
+<!--  Home -->
+<!-- Basic Settings -->
+<!-- Basic Settings/System  -->
 
 <!-- TimeZone -->
 <!--		"GMT-12", -->
-<!--		"GMT-11", -->	
-<!--		"GMT-10", -->	
-<!--		"GMT-09", -->	
-<!--		"GMT-08", -->	
-<!--		"GMT-07", -->	
-<!--		"GMT-06", -->	
-<!--		"GMT-05", -->	
-<!--		"GMT-05", -->	
-<!--		"GMT-04", -->	
-<!--		"GMT-04", -->	
-<!--		"GMT-04", -->	
-<!--		"GMT-03", -->	
-<!--		"GMT-02", -->	
-<!--		"GMT-01", -->	
-<!--		"GMT+00", -->		
-<!--		"GMT+01", -->	
-<!--		"GMT+02", -->	
-<!--		"GMT+02", --> 	
-<!--		"GMT+02", -->	
-<!--		"GMT+02", -->	
-<!--		"GMT+02", -->	
-<!--		"GMT+03", --> 	
-<!--		"GMT+03", -->	
-<!--		"GMT+03:30",-->	
-<!--		"GMT+04", --> 	
-<!--		"GMT+04:30", --> 	
-<!--		"GMT+05", -->    	
-<!--		"GMT+05:30", --> 	
-<!--		"GMT+06", -->    	
-<!--		"GMT+07", -->    	
-<!--		"GMT+08", --> 	
-<!--		"GMT+09", -->    	
-<!--		"GMT+09:30" --> 	
-<!--		"GMT+10", --> 	
-<!--		"GMT+10" -->	
-<!--		"GMT+11",--> 	
+<!--		"GMT-11", -->
+<!--		"GMT-10", -->
+<!--		"GMT-09", -->
+<!--		"GMT-08", -->
+<!--		"GMT-07", -->
+<!--		"GMT-06", -->
+<!--		"GMT-05", -->
+<!--		"GMT-05", -->
+<!--		"GMT-04", -->
+<!--		"GMT-04", -->
+<!--		"GMT-04", -->
+<!--		"GMT-03", -->
+<!--		"GMT-02", -->
+<!--		"GMT-01", -->
+<!--		"GMT+00", -->
+<!--		"GMT+01", -->
+<!--		"GMT+02", -->
+<!--		"GMT+02", -->
+<!--		"GMT+02", -->
+<!--		"GMT+02", -->
+<!--		"GMT+02", -->
+<!--		"GMT+03", -->
+<!--		"GMT+03", -->
+<!--		"GMT+03:30",-->
+<!--		"GMT+04", -->
+<!--		"GMT+04:30", -->
+<!--		"GMT+05", -->
+<!--		"GMT+05:30", -->
+<!--		"GMT+06", -->
+<!--		"GMT+07", -->
+<!--		"GMT+08", -->
+<!--		"GMT+09", -->
+<!--		"GMT+09:30" -->
+<!--		"GMT+10", -->
+<!--		"GMT+10" -->
+<!--		"GMT+11",-->
 <!--		"GMT+12", 	// 38 -->
 <!--		/* daylight saving time */-->
 <!--		"AKST9AKDT", -->
 <!--		"PST8PDT,M3.2.0/02:00:00,M11.1.0/02:00:00", // 40-->
-<!--		"MST7MDT",--> 	
+<!--		"MST7MDT",-->
 <!--		"GMT+0IST-1,M3.5.0/01:00:00,M10.5.0/02:00:00", // 42 -->
 <!--		"WET-0WEST-1,M3.5.0/01:00:00,M10.5.0/02:00:00", -->
 <!--		"GMT+0BST-1,M3.5.0/01:00:00,M10.5.0/02:00:00", // 44 -->
-<!--		"CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00", 		-->
+<!--		"CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00", -->
 <!--		"CFT-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00",// 46 -->
-<!--		"EET-2EEST-3,M3.5.0/03:00:00,M10.5.0/04:00:00", -->		
+<!--		"EET-2EEST-3,M3.5.0/03:00:00,M10.5.0/04:00:00", -->
 <!--		"MSK-3MSD,M3.5.0/2,M10.5.0/3", 		 // 48 -->
-<!--		"MST-3MDT,M3.5.0/2,M10.5.0/3",--> 	
+<!--		"MST-3MDT,M3.5.0/2,M10.5.0/3",-->
 <!--		"CST-9:30CDT-10:30,M10.5.0/02:00:00,M3.5.0/03:00:00", // 50 -->
-<!--		"EST-10EDT-11,M10.5.0/02:00:00,M3.5.0/03:00:00", 	-->	
+<!--		"EST-10EDT-11,M10.5.0/02:00:00,M3.5.0/03:00:00", 	-->
 <!--		"EST-10EDT-11,M10.1.0/02:00:00,M3.5.0/03:00:00", 	// 52 -->
-<!--		"NZST-12NZDT-13,M10.1.0/02:00:00,M3.3.0/03:00:00",--> 
+<!--		"NZST-12NZDT-13,M10.1.0/02:00:00,M3.3.0/03:00:00",-->
 <P64>GMT+08</P64>
 
 <!-- it's usefull when selfdefined time zone enable-->
-<P246>MTZ+6MDT+5,M4.1.0,M11.1.1</P246> 
+<P246>MTZ+6MDT+5,M4.1.0,M11.1.1</P246>
 
 <!-- Enable NTP Server 1- enable 0- disable -->
 <P5006>1</P5006>
@@ -134,7 +134,7 @@
 <P12806>96</P12806>
 <P12906>96</P12906>
 <P13006>96</P13006>
-		
+
 <!-- Video reselution -->
 <!-- Reselution = -->
 <!-- {2560,1920}- 1027 -->
@@ -183,7 +183,7 @@
 <P12408>1024</P12408>
 <P12508>1024</P12508>
 <P12608>1024</P12608>
-		
+
 <P12708>256</P12708>
 <P12808>256</P12808>
 <P12908>256</P12908>
@@ -209,7 +209,7 @@
 <P12810>1</P12810>
 <P12910>1</P12910>
 <P13010>1</P13010>
-		
+
 <!-- Video image quality 1 very high 2 high 3 normal 4 low 5 very low -->
 <P12311>3</P12311>
 <P12411>3</P12411>
@@ -222,101 +222,101 @@
 <P13011>3</P13011>
 
 <!-- Video i-frame interval 0-100 -->
-<P12312>30</P12312> 
-<P12412>30</P12412> 
-<P12512>30</P12512> 
-<P12612>30</P12612> 
+<P12312>30</P12312>
+<P12412>30</P12412>
+<P12512>30</P12512>
+<P12612>30</P12612>
 
-<P12712>30</P12712> 
-<P12812>30</P12812> 
-<P12912>30</P12912> 
-<P13012>30</P13012> 
+<P12712>30</P12712>
+<P12812>30</P12812>
+<P12912>30</P12912>
+<P13012>30</P13012>
 
 <!-- Profile,0- Baseline 1- Main Profile 2- High Profile -->
-<P12313>0</P12313> 
-<P12413>0</P12413> 
-<P12513>0</P12513> 
-<P12613>0</P12613> 
+<P12313>0</P12313>
+<P12413>0</P12413>
+<P12513>0</P12513>
+<P12613>0</P12613>
 
-<P12713>0</P12713> 
-<P12813>0</P12813> 
-<P12913>0</P12913> 
-<P13013>0</P13013> 
+<P12713>0</P12713>
+<P12813>0</P12813>
+<P12913>0</P12913>
+<P13013>0</P13013>
 
 
 <!-- Power frequency,0- indoor 50 ,1- indoor 60 ,2- outdoor -->
-<P12314>0</P12314> 
-<P12414>0</P12414> 
-<P12514>0</P12514> 
-<P12614>0</P12614> 
+<P12314>0</P12314>
+<P12414>0</P12414>
+<P12514>0</P12514>
+<P12614>0</P12614>
 
 <!-- Flip Setting, 0-stand, 1- overturn -->
-<P12315>0</P12315> 
-<P12415>0</P12415> 
-<P12515>0</P12515> 
-<P12615>0</P12615> 
+<P12315>0</P12315>
+<P12415>0</P12415>
+<P12515>0</P12515>
+<P12615>0</P12615>
 
 <!-- Audeo type 0 PCMU 1 PUMA 2 G726 3 Disbled -->
-<P14000>0</P14000> 
-<P14010>0</P14010> 
-<P14020>0</P14020> 
-<P14030>0</P14030> 
+<P14000>0</P14000>
+<P14010>0</P14010>
+<P14020>0</P14020>
+<P14030>0</P14030>
 
 <!-- Audio bit rate  16,24,32,40 -->
-<P14001>32</P14001> 
-<P14011>32</P14011> 
-<P14021>32</P14021> 
-<P14031>32</P14031> 
+<P14001>32</P14001>
+<P14011>32</P14011>
+<P14021>32</P14021>
+<P14031>32</P14031>
 
 <!-- Audio_mic_volume HIS:1-10 TI:1-5 -->
-<P14002>3</P14002> 
+<P14002>3</P14002>
 
 <!-- Audio_speaker_volume HIS:1-10 TI:0-31 -->
-<P14003>10</P14003> 
+<P14003>10</P14003>
 
 <!-- Audio line in  0 inside ,1 outside -->
-<P14004>0</P14004> 
+<P14004>0</P14004>
 
 <!-- Audio line out  0 inside ,1 outside -->
-<P14005>0</P14005> 
-		
-<!-- Chno0-3 osd text --> 
-<P10040>CHN1</P10040> 
-<P10050>CHN2</P10050> 
-<P10060>CHN3</P10060> 
-<P10070>CHN4</P10070> 
+<P14005>0</P14005>
+
+<!-- Chno0-3 osd text -->
+<P10040>CHN1</P10040>
+<P10050>CHN2</P10050>
+<P10060>CHN3</P10060>
+<P10070>CHN4</P10070>
 
 <!-- Chno0-3  osd position  0 top,1 bottom -->
-<P10041>0</P10041> 
-<P10051>0</P10051> 
-<P10061>0</P10061> 
-<P10071>0</P10071> 
+<P10041>0</P10041>
+<P10051>0</P10051>
+<P10061>0</P10061>
+<P10071>0</P10071>
 
 <!-- Chno0-3 osd transparency  20 = 20% -->
-<P10042>10</P10042> 
-<P10052>10</P10052> 
-<P10062>10</P10062> 
-<P10072>10</P10072> 
+<P10042>10</P10042>
+<P10052>10</P10052>
+<P10062>10</P10062>
+<P10072>10</P10072>
 
 <!-- Chno0-3 OSD Color HIS -->
-<P10043>0xFFFFFF</P10043> 
-<P10053>0xFFFFFF</P10053> 
-<P10063>0xFFFFFF</P10063> 
-<P10073>0xFFFFFF</P10073> 
+<P10043>0xFFFFFF</P10043>
+<P10053>0xFFFFFF</P10053>
+<P10063>0xFFFFFF</P10063>
+<P10073>0xFFFFFF</P10073>
 
 <!-- Chno0-3 osd time show enable 0 disable 1 show -->
-<P10044>1</P10044> 
-<P10054>1</P10054> 
-<P10064>1</P10064> 
-<P10074>1</P10074> 
-		
-<!-- Chno0-3 osd text show enable  0 disable 1 show -->
-<P10045>1</P10045> 
-<P10055>1</P10055> 
-<P10065>1</P10065> 
-<P10075>1</P10075> 
+<P10044>1</P10044>
+<P10054>1</P10054>
+<P10064>1</P10064>
+<P10074>1</P10074>
 
-<!-- 4 D1 option -->	
+<!-- Chno0-3 osd text show enable  0 disable 1 show -->
+<P10045>1</P10045>
+<P10055>1</P10055>
+<P10065>1</P10065>
+<P10075>1</P10075>
+
+<!-- 4 D1 option -->
 <!-- 1:H264 4*704*480, 2048kbps@15fps + no secondary stream -->
 <!-- 2:H264 4*704*480, 1536kbps@19fps + no secondary stream -->
 <!-- 3:H264 4*704*480, 1536kbps@15fps + secondary stream 4*QCIF     (176*112) 128kbps@10fps -->
@@ -325,86 +325,86 @@
 <!-- 6:H264 4*704*576, 1536kbps@10fps + secondary stream 4*QCIF (176*144) 128kbps@10fps -->
 <!-- 7:MJPEG 4*704*480, 4096kbps@15fps + no secondary stream -->
 <!-- 8:MJPEG 4*704*576, 4096kbps@13fps + no secondary stream -->
-<P10030>1</P10030> 
+<P10030>1</P10030>
 
 <!-- 4 D1 enable, 0- disable 1- enable -->
-<P10031>0</P10031> 
+<P10031>0</P10031>
 
 
 <!--  Basic Settings/CMOS setting -->
 
 <!-- Flip -->
-<P10500>0</P10500> 
+<P10500>0</P10500>
 
 <!-- Iris Setting, 0- Mech Manual 1- DC Auto 2- DC Manual -->
-<P10501>0</P10501> 
+<P10501>0</P10501>
 
 <!-- Iris Open, 0- 100% 1- 80% 2- 60% 3- 40% 4 -20% -->
-<P10502>0</P10502> 
+<P10502>0</P10502>
 
 <!-- Shutter Speed, 0- Auto  1- 1/30 2- 1/60 3- 1/125 4- 1/250 5- 1/500 6- 1/1000 -->
-<P10503>0</P10503> 
+<P10503>0</P10503>
 
 <!-- IR CUT Setting, 0- Manual 1- Automatic -->
-<P10504>0</P10504> 
+<P10504>0</P10504>
 
 <!-- Daytime/Night Model, 0- Daytime 1- Night -->
-<P10505>0</P10505> 
+<P10505>0</P10505>
 
 <!-- Color Model, 0- Color 1- B/W 2- Auto -->
-<P10506>0</P10506> 
+<P10506>0</P10506>
 
 <!-- IR CUT Sensitivity,1,2,3,4,5 -->
 <P10507>1</P10507>
 
 
-<!-- Basic Settings/Networking         -->                             
+<!-- Basic Settings/Networking         -->
 
 <!-- Address Type. 0 - DHCP, 1 - Static IP -->
-<P8>0</P8> 
+<P8>0</P8>
 <!-- Static IP. IP address, Ignore if DHCP is used -->
-<P9>192</P9> 
-<P10>168</P10> 
-<P11>1</P11> 
-<P12>168</P12> 
+<P9>192</P9>
+<P10>168</P10>
+<P11>1</P11>
+<P12>168</P12>
 
 <!-- Static IP. Subnet Mask,Ignore if DHCP is used -->
-<P13>255</P13> 
-<P14>255</P14> 
-<P15>255</P15> 
-<P16>0</P16> 
-		
+<P13>255</P13>
+<P14>255</P14>
+<P15>255</P15>
+<P16>0</P16>
+
 <!-- Static IP. Default Gateway, Ignore if DHCP is used -->
-<P17>192</P17> 
-<P18>168</P18> 
-<P19>1</P19> 
-<P20>168</P20> 
+<P17>192</P17>
+<P18>168</P18>
+<P19>1</P19>
+<P20>168</P20>
 
 <!-- Static IP. DNS Server 1, Ignore if DHCP is used -->
-<P21>0</P21> 
-<P22>0</P22> 
-<P23>0</P23> 
-<P24>0</P24> 	
-		
+<P21>0</P21>
+<P22>0</P22>
+<P23>0</P23>
+<P24>0</P24>
+
 <!-- Static IP. DNS Server 2 , Ignore if DHCP is used -->
-<P25>0</P25> 
-<P26>0</P26> 
-<P27>0</P27> 
-<P28>0</P28> 
+<P25>0</P25>
+<P26>0</P26>
+<P27>0</P27>
+<P28>0</P28>
 <!-- HTTP port -->
-<P901>0</P901> 
+<P901>0</P901>
 
 
-<!-- Basic Settings/PPPoE  -->                                          
+<!-- Basic Settings/PPPoE  -->
 
 <!-- PPPoE Account ID -->
 <P82></P82>
 
 <!-- PPPoE Password -->
-<P83></P83>  
+<P83></P83>
 
 
-<!-- Basic Settings/Wifi  -->                                      	   
+<!-- Basic Settings/Wifi  -->                                      
 
 <!-- Wifi webs value : p_value value -->
 <!-- Authentication Mode: 0-open,1-share,2-wepauto,3-wpa psk,4-wpa2 psk,5-wpa none -->
@@ -419,16 +419,16 @@
 <!-- 6(WPA2 PSK AES)                   4                        3 -->
 
 <!-- Enable wifi: 0-disenabled, 1-enabled -->
-<P7800>0</P7800> 
+<P7800>0</P7800>
 
 <!-- SSID -->
 <P7812></P7812>
 
-<!-- Authentication Mode: 0- Open, 1- Shared, 2- WEPAUTO, 3- WPAPSK, 4- WPA2PSK, 5- WPANONE --> 
-<P7814></P7814>  
+<!-- Authentication Mode: 0- Open, 1- Shared, 2- WEPAUTO, 3- WPAPSK, 4- WPA2PSK, 5- WPANONE -->
+<P7814></P7814>
 
-<!-- Encryption: 0- None, 1- WEP, 2- TKIP, 3- AES --> 
-<P7815></P7815> 
+<!-- Encryption: 0- None, 1- WEP, 2- TKIP, 3- AES -->
+<P7815></P7815>
 
 <!-- WEP KEY INDEX: 0-Not selected, 1-Selected; Four only one selected, if you select more than one, first check the effect -->
 <P7821></P7821>
@@ -436,16 +436,16 @@
 <P7823></P7823>
 <P7824></P7824>
 
-<!-- Key(For SSID password) --> 
+<!-- Key(For SSID password) -->
 <P7829></P7829>
 
 
-<!--   Basic Settings/DDNS -->                                      	     
+<!--   Basic Settings/DDNS -->                                      
 
 <!-- Enable ddns: 0-disenabled, 1-enabled -->
-<P10100>0</P10100> 
+<P10100>0</P10100>
 <!-- isp type: 0-dyndns.org, 1-noip.com,2-ActiveDNS,3-cn99.com,4-ipkan.net,5-ipkan.cn,6-ipkan.com.cn -->
-<P10101>2</P10101> 
+<P10101>2</P10101>
 
 <!-- Self-Define DDNS Address -->
 <P10102></P10102>
@@ -453,7 +453,7 @@
 <!-- Site Name -->
 <P10103></P10103>
 
-<!-- DDNS Account --> 
+<!-- DDNS Account -->
 <P10104></P10104>
 
 <!-- DDNS Password  -->
@@ -463,13 +463,13 @@
 <P10106></P10106>
 
 
-<!--  Basic Settings/SIP -->                                        	    
+<!--  Basic Settings/SIP -->                                        
 
 <!-- SIP state 0- off-line   1- on-line-->
-<P271>0</P271>  
+<P271>0</P271>
 
 <!-- SIP unregister 0- unregister 1- register-->
-<P81>0</P81> 
+<P81>0</P81>
 
 <!-- SIP account name-->
 <P270></P270>
@@ -492,14 +492,14 @@
 <!-- SIP stun server -->
 <P76></P76>
 
-<!-- SIP stream--> 
+<!-- SIP stream-->
 <P10450></P10450>
 
 <!-- SIP preferred Vocoder-->
-<!-- 0 - PCMU, 2 - G.726-32, 3 - GSM, 4 - G.723.1, 8 - PCMA,--> 
+<!-- 0 - PCMU, 2 - G.726-32, 3 - GSM, 4 - G.723.1, 8 - PCMA,-->
 <!-- 9 - G.722, 18 - G.729A/B, 98 - L16-256-->
 <!-- Inherit sip phone(3000 phone)-->
-<P57>0</P57> 
+<P57>0</P57>
 
 <!-- SIP regexpiration -->
 <P32>3</P32>
@@ -528,7 +528,7 @@
 <!-- SIP enable Dual-way Audio Warning Mode -->
 <P10455></P10455>
 
-<!-- SIP open door --> 
+<!-- SIP open door -->
 <P10456></P10456>
 
 <!-- SIP open door password -->
@@ -538,55 +538,55 @@
 <P10458></P10458>
 
 <!-- Phoneconf.namephone@conf.com   @ the sign of partition between num and the phoneconf.name -->
-<P10459>13788888888@liming,13788888888@liming1,13788888888@liming2</P10459> 
+<P10459>13788888888@liming,13788888888@liming1,13788888888@liming2</P10459>
 
 <!-- White list -->
-<P10460>13788888888,13788888889,13788888810</P10460> 
-		
+<P10460>13788888888,13788888889,13788888810</P10460>
 
 
-<!--  Basic Settings/Status -->                                           
+
+<!--  Basic Settings/Status -->
 
 
 
 
-<!-- Advanced Settings -->	    						                                     
+<!-- Advanced Settings -->	    
 
 
 
-<!--Advanced Settings/User Management -->                                
+<!--Advanced Settings/User Management -->
 
 
 
 
 
-<!-- Advanced Settings/Maintenance -->                                    
+<!-- Advanced Settings/Maintenance -->
 
 <!--UPGRADE -->
 <!-- Upgrade via. 1- TFTP, 2- HTTP, 3- HTTPS -->
-<P212>2</P212> 
+<P212>2</P212>
 
 <!-- Firmware Server Path -->
-<P192>fm.grandstream.com/gs</P192> 
+<P192>fm.grandstream.com/gs</P192>
 
 <!-- Config Server Path  -->
 
-<P237>{$domain_name}{$project_path}/app/provision</P237> 
+<P237>{$domain_name}{$project_path}/app/provision</P237>
 
 <!-- XML Config File Password  -->
 <P1359></P1359>
 
 <!-- Automatic Upgrade Interval(Minutes):60-525600  -->
-<P193>1080</P193> 
+<P193>1080</P193>
 
 <!-- Automatic Upgrade: 0- disenabled, 1- enabled  -->
-<P194>1</P194> 
+<P194>1</P194>
 
 
-<!--  Advanced Settings/SMTP -->                                     	     
+<!--  Advanced Settings/SMTP -->                                     
 
 <!-- Enable smtp. 0- disenabled, 1- enabled -->
-<P10120>0</P10120> 
+<P10120>0</P10120>
 
 <!-- SMTP Server  -->
 <P10121></P10121>
@@ -595,7 +595,7 @@
 <P10122></P10122>
 
 <!-- From E-Mail address  -->
-<P10123></P10123>  
+<P10123></P10123>
 
 <!-- To E-Mail address 1  -->
 <P10124></P10124>
@@ -603,23 +603,23 @@
 <!-- To E-Mail address 2  -->
 <P10125></P10125>
 
-<!-- To E-Mail address 3 --> 
+<!-- To E-Mail address 3 -->
 <P10126></P10126>
 
-<!-- User Name --> 
+<!-- User Name -->
 <P10127></P10127>
 
-<!-- Password --> 
+<!-- Password -->
 <P10128></P10128>
 
 <!-- SSL. 0- disenabled, 1- enabled -->
 <P10129></P10129>
 
 
-<!-- Advanced Settings/FTP  -->                                    	   
+<!-- Advanced Settings/FTP  -->                                    
 
-<!-- Enable FTP. 0- disenabled, 1- enabled --> 
-<P10140>0</P10140> 
+<!-- Enable FTP. 0- disenabled, 1- enabled -->
+<P10140>0</P10140>
 
 <!-- FTP Server  -->
 <P10141></P10141>
@@ -637,56 +637,56 @@
 <P10145></P10145>
 
 
-<!--  Advanced Settings/PTZ -->                                    	     
+<!--  Advanced Settings/PTZ -->                                    
 
-<!-- PTZ procotol: 0-Pelco-P, 1-Pelco-D--> 
-<P10150>0</P10150> 
+<!-- PTZ procotol: 0-Pelco-P, 1-Pelco-D-->
+<P10150>0</P10150>
 
-<!-- PTZ baudrate: 2400/4800/9600/19200--> 
-<P10151>4800</P10151> 
+<!-- PTZ baudrate: 2400/4800/9600/19200-->
+<P10151>4800</P10151>
 
 
-<!--  Advanced Settings/Alarm Servers-->                                
+<!--  Advanced Settings/Alarm Servers-->
 
-<!-- Server Name--> 
+<!-- Server Name-->
 <P10162></P10162>
 
 <!-- URL -->
 <P10163></P10163>
 
-<!-- User Name --> 
+<!-- User Name -->
 <P10162></P10162>
 
 <!-- Password -->
 <P10163></P10163>
 
 
-<!-- 	Advanced Settings/Alarm Event-->                           
+<!-- 	Advanced Settings/Alarm Event-->
 
 
 <!-- 	Alarm Event Channel 1-->
 
 <!-- Channel 1 Alarm Action -->
 <!-- Record Video time: pre_time@end_time-->
-<P10170>0@15</P10170> 
+<P10170>0@15</P10170>
 
 <!-- Enable alarm storage 0- disable 1:enable //sd card 2:usbdisk //3:harddisk -->
-<P10171>0</P10171> 
+<P10171>0</P10171>
 
 <!-- Enable sip alarm 1- enable 0- disable -->
-<P10172>0</P10172> 
+<P10172>0</P10172>
 
 <!-- Enable alarm output 1- enable 0- disable -->
-<P10173>0</P10173> 
+<P10173>0</P10173>
 
 <!-- Enable Upload to Alarm Center 1- enable 0- disable -->
-<P10174>1</P10174> 
+<P10174>1</P10174>
 
 <!-- Enable Upload to Alarm HTTP Server 1- enable 0- disable -->
-<P10175>0</P10175> 
+<P10175>0</P10175>
 
 <!-- Enable Record Video and Upload to FTP Server 1- enable 0- disable -->
-<P10176>0</P10176> 
+<P10176>0</P10176>
 
 <!-- Enable Email and FTP upload JPEG and Store it to USB card or SD drive 1- enable 0- disable -->
 <P10177>0</P10177>
@@ -697,111 +697,111 @@
 
 
 <!--  Alarm Event Channel 2 	-->
-                      	   
+                      
 <!-- Channel 2 Alarm Action -->
 <!-- Record Video time: pre_time@end_time  -->
-<P10190>0@15</P10190> 
+<P10190>0@15</P10190>
 
 <!-- Enable alarm storage 0- disable 1:enable //sd card 2:usbdisk //3:harddisk -->
-<P10191>0</P10191> 
+<P10191>0</P10191>
 
-<!-- Enable sip alarm 1- enable 0- disable --> 
+<!-- Enable sip alarm 1- enable 0- disable -->
 <P10192>0</P10192>
 
 <!-- Enable alarm output 1- enable 0- disable -->
-<P10193>0</P10193> 
+<P10193>0</P10193>
 
 <!-- Enable Upload to Alarm Center 1- enable 0- disable -->
-<P10194>1</P10194> 
+<P10194>1</P10194>
 
 <!-- Enable Upload to Alarm HTTP Server 1- enable 0- disable -->
-<P10195>0</P10195> 
+<P10195>0</P10195>
 
 <!-- Enable Record Video and Upload to FTP Server 1- enable 0- disable -->
-<P10196>0</P10196> 
+<P10196>0</P10196>
 
 <!-- Enable Email and FTP upload JPEG and Store it to USB card or SD drive 1- enable 0- disable -->
-<P10197>0</P10197> 
+<P10197>0</P10197>
 
 <!-- Channel 2 Alarm Event Time Schedule  -->
 <!-- Probe chn2 alarm time week@start_time@end_time week(0-7 7=everyday) time(00:00)  -->
 <P10200></P10200>
 
 	<!-- Alarm Event Channel 3  -->
-	                      	
+
 <!-- Channel 3 Alarm Action  -->
-<!-- Record Video time: pre_time@end_time --> 
-<P10210>0@15</P10210> 
+<!-- Record Video time: pre_time@end_time -->
+<P10210>0@15</P10210>
 
 <!-- Enable alarm storage 0- disable 1:enable //sd card 2:usbdisk //3:harddisk -->
-<P10211>0</P10211> 
+<P10211>0</P10211>
 
 <!-- Enable sip alarm 1- enable 0- disable -->
-<P10212>0</P10212> 
+<P10212>0</P10212>
 
 <!-- Enable alarm output 1- enable 0- disable -->
-<P10213>0</P10213> 
+<P10213>0</P10213>
 
 <!-- Enable Upload to Alarm Center 1- enable 0- disable -->
-<P10214>1</P10214> 
+<P10214>1</P10214>
 
 <!-- Enable Upload to Alarm HTTP Server 1- enable 0- disable -->
-<P10215>0</P10215> 
+<P10215>0</P10215>
 
 <!-- Enable Record Video and Upload to FTP Server 1- enable 0- disable -->
-<P10216>0</P10216> 
+<P10216>0</P10216>
 
 <!-- Enable Email and FTP upload JPEG and Store it to USB card or SD drive 1- enable 0- disable -->
-<P10217>0</P10217> 
+<P10217>0</P10217>
 
 <!-- Channel 3 Alarm Event Time Schedule## -->
-<!-- Probe chn3 alarm time week@start_time@end_time week(0-7 7=everyday) time(00:00) --> 
+<!-- Probe chn3 alarm time week@start_time@end_time week(0-7 7=everyday) time(00:00) -->
 <P10220></P10220>
 
 
-<!-- Alarm Event Channel 4 	      -->                  	     
+<!-- Alarm Event Channel 4 	      -->                  
 
 <!--  Channel 4 Alarm Action ## -->
-<!-- Record Video time: pre_time@end_time --> 
-<P10230>0@15</P10230> 
+<!-- Record Video time: pre_time@end_time -->
+<P10230>0@15</P10230>
 
 <!-- Enable alarm storage 0- disable 1:enable //sd card 2:usbdisk //3:harddisk -->
-<P10231>0</P10231> 
+<P10231>0</P10231>
 
 <!-- Enable sip alarm 1- enable 0- disable -->
-<P10232>0</P10232> 
+<P10232>0</P10232>
 
 <!-- Enable alarm output 1- enable 0- disable -->
-<P10233>0</P10233> 
+<P10233>0</P10233>
 
 <!-- Enable Upload to Alarm Center 1- enable 0- disable -->
-<P10234>1</P10234> 
+<P10234>1</P10234>
 
 <!-- Enable Upload to Alarm HTTP Server 1- enable 0- disable -->
-<P10235>0</P10235> 
+<P10235>0</P10235>
 
 <!-- Enable Record Video and Upload to FTP Server 1- enable 0- disable -->
-<P10236>0</P10236> 
+<P10236>0</P10236>
 
 <!-- Enable Email and FTP upload JPEG and Store it to USB card or SD drive 1- enable 0- disable -->
-<P10237>0</P10237> 
+<P10237>0</P10237>
 
 <!--Channel 4 Alarm Event Time Schedule ## -->
-<!-- Probe chn3 alarm time week@start_time@end_time week(0-7 7=everyday) time(00:00) --> 
+<!-- Probe chn3 alarm time week@start_time@end_time week(0-7 7=everyday) time(00:00) -->
 <P10240></P10240>
 
 
 <!--Advanced Settings/Motion Detection -->
 
 
-<!-- Motion Detection Channel 1  -->	                         
+<!-- Motion Detection Channel 1  -->
 
 <!--  Channel 1 Motion Detection Region Settings ## -->
 <!-- Enable Motion Detection. 0- disable, 1- enable -->
-<P10250>1</P10250> 
+<P10250>1</P10250>
 
 <!-- Region1 coordinate and sensitivity. Format:start_coordinate(x1*y1)@end_coordinate(x2*y2)@sensitivity(0-100) -->
-<P10251>0*0@704*576@50</P10251> 
+<P10251>0*0@704*576@50</P10251>
 
 <!-- Region2 coordinate and sensitivity -->
 <P10252></P10252>
@@ -813,7 +813,7 @@
 <P10254></P10254>
 
 <!-- Region5 coordinate and sensitivity -->
-<P10255></P10255>  
+<P10255></P10255>
 
 <!-- Region6 coordinate and sensitivity -->
 <P10256></P10256>
@@ -822,7 +822,7 @@
 <P10257></P10257>
 
 <!-- Region8 coordinate and sensitivity -->
-<P10258></P10258>  
+<P10258></P10258>
 
 <!-- Region9 coordinate and sensitivity -->
 <P10259></P10259>
@@ -849,55 +849,55 @@
 <P10266></P10266>
 
 <!-- Channel 1 Alarm Action ## -->
-<!-- Record Video time =  pre_time@end_time --> 
-<P10270>0@15</P10270> 
+<!-- Record Video time =  pre_time@end_time -->
+<P10270>0@15</P10270>
 
 <!-- Enable alarm storage. 0- disable, 1- enable //sd card, 2- usbdisk, //3- harddisk -->
-<P10271>0</P10271>  
+<P10271>0</P10271>
 
 <!-- Enable sip alarm. 1- enable, 0- disable -->
-<P10272>0</P10272> 
+<P10272>0</P10272>
 
 <!-- Enable alarm output. 1- enable, 0- disable -->
-<P10273>0</P10273> 
+<P10273>0</P10273>
 
 <!-- Enable Upload to Alarm Center. 1- enable, 0- disable -->
-<P10274>1</P10274> 
+<P10274>1</P10274>
 
 <!-- Enable Upload to Alarm HTTP Server. 1- enable, 0- disable -->
-<P10275>0</P10275> 
+<P10275>0</P10275>
 
 <!-- Enable Record Video and Upload to FTP Server 1- enable 0- disable -->
-<P10276>0</P10276> 
+<P10276>0</P10276>
 
 <!-- Enable Email and FTP upload JPEG and Store it to USB card or SD drive. 1- enable, 0- disable -->
-<P10277>0</P10277> 
+<P10277>0</P10277>
 
 <!-- Channel 1 Motion Detection Time Schedule ## -->
-<!-- Md chn1 alarm time --> 
+<!-- Md chn1 alarm time -->
 <!-- Region1 alarm time. Format:week@start_time@end_time week(0-7 7=everyday) time(00:00) -->
-<P10280>7@02:30@16:25</P10280> 
+<P10280>7@02:30@16:25</P10280>
 
 <!-- Region2 alarm time -->
-<P10281></P10281>  
+<P10281></P10281>
 
 <!-- Region3 alarm time -->
 <P10282></P10282>
 
 <!-- Region4 alarm time -->
-<P10283></P10283>  
+<P10283></P10283>
 
 <!-- Region5 alarm time -->
-<P10284></P10284>  
+<P10284></P10284>
 
 <!-- Region6 alarm time -->
-<P10285></P10285>  
+<P10285></P10285>
 
 <!-- Region7 alarm time -->
 <P10286></P10286>
 
 <!-- Region8 alarm time -->
-<P10287></P10287>  
+<P10287></P10287>
 
 <!-- Region9 alarm time -->
 <P10288></P10288>
@@ -909,32 +909,32 @@
 <P10290></P10290>
 
 <!-- Region12 alarm time -->
-<P10291></P10291>  
+<P10291></P10291>
 
 <!-- Region13 alarm time -->
-<P10292></P10292>  
+<P10292></P10292>
 
 <!-- Region14 alarm time -->
 <P10293></P10293>
 
 <!-- Region15 alarm time -->
-<P10294></P10294>  
+<P10294></P10294>
 
 <!-- Region16 alarm time -->
 <P10295></P10295>
 
 
-<!-- Motion Detection Channel 2 	 -->                       
+<!-- Motion Detection Channel 2 	 -->
 
 <!-- Channel 2 Motion Detection Region Settings ## -->
 <!-- Enable Motion Detection. 0- disable, 1- enable -->
-<P10300>0</P10300>  
+<P10300>0</P10300>
 
 <!-- Region1 coordinate and sensitivity. Format:start_coordinate(x1*y1)@end_coordinate(x2*y2)@sensitivity(0-100) -->
-<P10301>0*0@704*576@50</P10301> 
+<P10301>0*0@704*576@50</P10301>
 
 <!-- Region2 coordinate and sensitivity -->
-<P10302></P10302>  
+<P10302></P10302>
 
 <!-- Region3 coordinate and sensitivity -->
 <P10303></P10303>
@@ -946,7 +946,7 @@
 <P10305></P10305>
 
 <!-- Region6 coordinate and sensitivity -->
-<P10306></P10306>  
+<P10306></P10306>
 
 <!-- Region7 coordinate and sensitivity -->
 <P10307></P10307>
@@ -961,16 +961,16 @@
 <P10310></P10310>
 
 <!-- Region11 coordinate and sensitivity -->
-<P10311></P10311>  
+<P10311></P10311>
 
 <!-- Region12 coordinate and sensitivity -->
-<P10312></P10312>  
+<P10312></P10312>
 
 <!-- Region13 coordinate and sensitivity -->
-<P10313></P10313>  
+<P10313></P10313>
 
 <!-- Region14 coordinate and sensitivity -->
-<P10314></P10314>  
+<P10314></P10314>
 
 <!-- Region15 coordinate and sensitivity -->
 <P10315></P10315>
@@ -979,34 +979,34 @@
 <P10316></P10316>
 
 <!-- Channel 2 Alarm Action  -->
-<!-- Record Video time =  pre_time@end_time --> 
-<P10320>30@60</P10320> 
+<!-- Record Video time =  pre_time@end_time -->
+<P10320>30@60</P10320>
 
 <!-- Enable alarm storage. 0- disable, 1- enable //sd card, 2- usbdisk, //3- harddisk -->
-<P10321>0</P10321> 
+<P10321>0</P10321>
 
 <!-- Enable sip alarm. 1- enable, 0- disable -->
-<P10322>0</P10322> 
+<P10322>0</P10322>
 
 <!-- Enable alarm output. 1- enable, 0- disable -->
-<P10323>0</P10323> 
+<P10323>0</P10323>
 
 <!-- Enable Upload to Alarm Center. 1- enable, 0- disable -->
-<P10324>0</P10324> 
+<P10324>0</P10324>
 
 <!-- Enable Upload to Alarm HTTP Server. 1- enable, 0- disable -->
-<P10325>0</P10325> 
+<P10325>0</P10325>
 
 <!-- Enable Record Video and Upload to FTP Server 1- enable 0- disable -->
-<P10326>0</P10326> 
+<P10326>0</P10326>
 
 <!-- Enable Email and FTP upload JPEG and Store it to USB card or SD drive. 1- enable, 0- disable -->
-<P10327>0</P10327> 
+<P10327>0</P10327>
 
 <!-- Channel 2 Motion Detection Time Schedule ## -->
-<!-- Md chn2 alarm time --> 
+<!-- Md chn2 alarm time -->
 <!-- Region1 alarm time. Format:week@start_time@end_time week(0-7 7=everyday) time(00:00) -->
-<P10330>7@02:30@16:25</P10330> 
+<P10330>7@02:30@16:25</P10330>
 
 <!-- Region2 alarm time -->
 <P10331></P10331>
@@ -1051,17 +1051,17 @@
 <P10344></P10344>
 
 <!-- Region16 alarm time -->
-<P10345></P10345>  
+<P10345></P10345>
 
 
-<!-- Motion Detection Channel 3 	   -->                 
+<!-- Motion Detection Channel 3 	   -->
 
 <!-- Channel 3 Motion Detection Region Settings ## -->
 <!-- Enable Motion Detection. 0- disable, 1- enable -->
-<P10350>0</P10350> 
+<P10350>0</P10350>
 
 <!-- Region1 coordinate and sensitivity. Format:start_coordinate(x1*y1)@end_coordinate(x2*y2)@sensitivity(0-100) -->
-<P10351>0*0@704*576@50</P10351> 
+<P10351>0*0@704*576@50</P10351>
 
 <!-- Region2 coordinate and sensitivity -->
 <P10352></P10352>
@@ -1088,7 +1088,7 @@
 <P10359></P10359>
 
 <!-- Region10 coordinate and sensitivity -->
-<P10360></P10360>  
+<P10360></P10360>
 
 <!-- Region11 coordinate and sensitivity -->
 <P10361></P10361>
@@ -1109,34 +1109,34 @@
 <P10366></P10366>
 
 <!--  Channel 3 Alarm Action ## -->
-<!-- Record Video time =  pre_time@end_time --> 
-<P10370>30@60</P10370> 
+<!-- Record Video time =  pre_time@end_time -->
+<P10370>30@60</P10370>
 
 <!-- Enable alarm storage. 0- disable, 1- enable //sd card, 2- usbdisk, //3- harddisk -->
-<P10371>1</P10371> 
+<P10371>1</P10371>
 
 <!-- Enable sip alarm. 1- enable, 0- disable -->
-<P10372>1</P10372> 
+<P10372>1</P10372>
 
 <!-- Enable alarm output. 1- enable, 0- disable -->
-<P10373>1</P10373> 
+<P10373>1</P10373>
 
 <!-- Enable Upload to Alarm Center. 1- enable, 0- disable -->
-<P10374>1</P10374> 
+<P10374>1</P10374>
 
 <!-- Enable Upload to Alarm HTTP Server. 1- enable, 0- disable -->
-<P10375>1</P10375> 
+<P10375>1</P10375>
 
 <!-- Enable Record Video and Upload to FTP Server 1- enable 0- disable -->
-<P10376>1</P10376> 
+<P10376>1</P10376>
 
 <!-- Enable Email and FTP upload JPEG and Store it to USB card or SD drive. 1- enable, 0- disable -->
-<P10377>1</P10377> 
+<P10377>1</P10377>
 
 <!-- Channel 3 Motion Detection Time Schedule ## -->
-<!-- Md chn3 alarm time --> 
+<!-- Md chn3 alarm time -->
 <!-- Region1 alarm time. Format:week@start_time@end_time week(0-7 7=everyday) time(00:00) -->
-<P10380>7@02:30@16:25</P10380> 
+<P10380>7@02:30@16:25</P10380>
 
 <!-- Region2 alarm time -->
 <P10381></P10381>
@@ -1160,43 +1160,43 @@
 <P10387></P10387>
 
 <!-- Region9 alarm time -->
-<P10388></P10388>  
+<P10388></P10388>
 
 <!-- Region10 alarm time -->
-<P10389></P10389>  
+<P10389></P10389>
 
 <!-- Region11 alarm time -->
-<P10390></P10390>    
+<P10390></P10390>
 
 <!-- Region12 alarm time -->
-<P10391></P10391>  
+<P10391></P10391>
 
 <!-- Region13 alarm time -->
-<P10392></P10392>  
+<P10392></P10392>
 
 <!-- Region14 alarm time -->
-<P10393></P10393>  
+<P10393></P10393>
 
 <!-- Region15 alarm time -->
-<P10394></P10394>  
+<P10394></P10394>
 
 <!-- Region16 alarm time -->
-<P10395></P10395>  
+<P10395></P10395>
 
 
-<!--Motion Detection Channel 4 --> 	                    
+<!--Motion Detection Channel 4 --> 
 <!-- Channel 4 Motion Detection Region Settings ## -->
 <!-- Enable Motion Detection. 0- disable, 1- enable -->
-<P10400>0</P10400> 
+<P10400>0</P10400>
 
 <!-- Region1 coordinate and sensitivity. Format:start_coordinate(x1*y1)@end_coordinate(x2*y2)@sensitivity(0-100) -->
-<P10401>0*0@704*576@50</P10401> 
+<P10401>0*0@704*576@50</P10401>
 
 <!-- Region2 coordinate and sensitivity -->
-<P10402></P10402>  
+<P10402></P10402>
 
 <!-- Region3 coordinate and sensitivity -->
-<P10403></P10403>  
+<P10403></P10403>
 
 <!-- Region4 coordinate and sensitivity -->
 <P10404></P10404>
@@ -1205,7 +1205,7 @@
 <P10405></P10405>
 
 <!-- Region6 coordinate and sensitivity -->
-<P10406></P10406>  
+<P10406></P10406>
 
 <!-- Region7 coordinate and sensitivity -->
 <P10407></P10407>
@@ -1217,13 +1217,13 @@
 <P10409></P10409>
 
 <!-- Region10 coordinate and sensitivity -->
-<P10410></P10410>  
+<P10410></P10410>
 
 <!-- Region11 coordinate and sensitivity -->
 <P10411></P10411>
 
 <!-- Region12 coordinate and sensitivity -->
-<P10412></P10412>  
+<P10412></P10412>
 
 <!-- Region13 coordinate and sensitivity -->
 <P10413></P10413>
@@ -1238,38 +1238,38 @@
 <P10416></P10416>
 
 <!-- Channel 4 Alarm Action ## -->
-<!-- Record Video time =  pre_time@end_time --> 
-<P10420>30@60</P10420> 
+<!-- Record Video time =  pre_time@end_time -->
+<P10420>30@60</P10420>
 
 <!-- Enable alarm storage. 0- disable, 1- enable //sd card, 2- usbdisk, //3- harddisk -->
-<P10421>0</P10421> 
+<P10421>0</P10421>
 
 <!-- Enable sip alarm. 1- enable, 0- disable -->
-<P10422>0</P10422> 
+<P10422>0</P10422>
 
 <!-- Enable alarm output. 1- enable, 0- disable -->
-<P10423>0</P10423> 
+<P10423>0</P10423>
 
 <!-- Enable Upload to Alarm Center. 1- enable, 0- disable -->
-<P10424>0</P10424> 
+<P10424>0</P10424>
 
 <!-- Enable Upload to Alarm HTTP Server. 1- enable, 0- disable -->
-<P10425>0</P10425> 
+<P10425>0</P10425>
 
 <!-- Enable Record Video and Upload to FTP Server 1- enable 0- disable -->
-<P10426>0</P10426> 
+<P10426>0</P10426>
 
 <!-- Enable Email and FTP upload JPEG and Store it to USB card or SD drive. 1- enable, 0- disable -->
-<P10427>0</P10427> 
+<P10427>0</P10427>
 
 <!-- Channel 4 Motion Detection Time Schedule ## -->
 
-<!-- Md chn4 alarm time --> 
+<!-- Md chn4 alarm time -->
 <!-- Region1 alarm time. Format:week@start_time@end_time week(0-7 7=everyday) time(00:00) -->
-<P10430>7@02:30@16:25</P10430> 
+<P10430>7@02:30@16:25</P10430>
 
 <!-- Region2 alarm time -->
-<P10431></P10431>  
+<P10431></P10431>
 
 <!-- Region3 alarm time -->
 <P10432></P10432>
@@ -1278,7 +1278,7 @@
 <P10433></P10433>
 
 <!-- Region5 alarm time -->
-<P10434></P10434>  
+<P10434></P10434>
 
 <!-- Region6 alarm time -->
 <P10435></P10435>
@@ -1292,10 +1292,10 @@
 <P10438></P10438>
 
 <!-- Region10 alarm time -->
-<P10439></P10439>  
+<P10439></P10439>
 
 <!-- Region11 alarm time -->
-<P10440></P10440>  
+<P10440></P10440>
 
 <!-- Region12 alarm time -->
 <P10441></P10441>
@@ -1307,39 +1307,39 @@
 <P10443></P10443>
 
 <!-- Region15 alarm time -->
-<P10444></P10444>  
+<P10444></P10444>
 
 <!-- Region16 alarm time -->
 <P10445></P10445>
 
 
-<!-- Advanced Settings/Syslog -->                                  	    
+<!-- Advanced Settings/Syslog -->                                  
 
-<!-- Syslog Server -->	
+<!-- Syslog Server -->
 <P207></P207>
 
-<!-- Syslog Level. 0- None, 1- Debug, 2- Info, 3- Warning, 4- Error --> 
-<P208>0</P208> 
+<!-- Syslog Level. 0- None, 1- Debug, 2- Info, 3- Warning, 4- Error -->
+<P208>0</P208>
 
 
-<!-- Advanced Settings/Record -->                                  	    
+<!-- Advanced Settings/Record -->                                  
 
 <!-- Enable Record Schedule. 0- disable, 1- enable -->
-<P10480>1</P10480> 
+<P10480>1</P10480>
 
-<!-- Record Time Table,week1@start_tm1@end_tm1;week2@start_tm2@end_tm2;...; --> 
+<!-- Record Time Table,week1@start_tm1@end_tm1;week2@start_tm2@end_tm2;...; -->
 <P10481></P10481>
 
 
-<!-- Advanced  Settings/Live Storage -->                                 
+<!-- Advanced  Settings/Live Storage -->
 
 <!-- On Disk Full.1- Delete the earliest video or image files, 2- Stop storing video and image files -->
 <P10490>1</P10490>
 
-	
+
 </config>
 </gs_provision>
-		
-		
-		
-			
+
+
+
+
diff --git a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
index 35a6ef4bb8..74e77f0e2e 100644
--- a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
@@ -4,7 +4,10 @@
 
 	<!-- Advanced Settings -->
 		<!-- Admin password for web interface,String Max Length: 30; between ascii values 33 and 126, Mandatory -->
-		<P2>admin</P2>
+		<P2>{$admin_password}</P2>
+
+		<!-- End User Password, MaxLength 32 -->
+		<P196>{$user_password}</P196>
 
 	<!-- Firmware Upgrade -->
 		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade., Number: 0 to 2. Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
index e5ce1ddf98..d3f161799e 100644
--- a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
@@ -4,7 +4,10 @@
 
 	<!-- Advanced Settings -->
 		<!-- Admin password for web interface,String Max Length: 30; between ascii values 33 and 126, Mandatory -->
-		<P2>admin</P2>
+		<P2>{$admin_password}</P2>
+
+		<!-- End User Password, MaxLength 32 -->
+		<P196>{$user_password}</P196>
 
 	<!-- Firmware Upgrade -->
 		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade., Number: 0 to 2. Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index 8a60566404..a0c3f1cc8a 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -6,7 +6,9 @@
     <!-- Admin password for web interface -->
     <!-- String Max Length: 30; between ascii values 33 and 126 -->
     <!-- Mandatory -->
-    <P2>admin</P2>
+    <P2>{$admin_password}</P2>
+    <!-- End User Password, MaxLength 32 -->
+    <P196>{$user_password}</P196>
     <!-- Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) -->
     <!-- Number: 0 to 63 -->
     <!-- Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
index 53b7a56bc0..fb00d47ec0 100644
--- a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
@@ -4,7 +4,9 @@
     <!-- Configuration template for GXW410x version 1.3.4.13 -->
     <!-- Advanced/System-wide Options -->
     <!--  Admin password for web interface, max. length is 30 -->
-    <P2>admin</P2>
+    <P2>{$admin_password}</P2>
+    <!-- End User Password, MaxLength 32 -->
+    <P196>{$user_password}</P196>
     <!--  G.723 rate: 0 - 6.3kbps encoding rate,  1 - 5.3kbps encoding rate -->
     <P49>0</P49>
     <!--  Voice Frames per TX (up to 10/20/32/64 frames for G711/G726/G723/other codecs respectively) -->
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index b22af0808c..0e99245f2c 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <gs_provision version="1">
 	<config version="1">
-		
+
 <!-- Configuration template for GXW42XX firmware version 1.0.4.7 -->                                                                 
 
 <!-- Change Log -->                                                                                             
@@ -20,6 +20,11 @@
 
 <!-- Maintenance-Network setting --> 
 
+<!-- Admin Password for web interface, MaxLength 32 -->
+<P2>{$admin_password}</P2>
+
+<!-- End User Password, MaxLength 32 -->
+<P196>{$user_password}</P196>
 
 <!-- IP Address Mode. 0 - DHCP, 1 - Static IP, 2 - PPPoE --> 
 <!-- Number: 0,1,2 --> 
diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index 4bdc083da5..cfa7dd2cdc 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -7,7 +7,10 @@
 	<!-- Advanced Settings. -->   
 		<!-- Admin password for web interface -->    
 		<!-- Max Length: 30 characters; between ascii values 33 and 126 -->   
-		<P2>admin</P2> 
+		<P2>{$admin_password}</P2>
+
+		<!-- End User Password, MaxLength 32 -->
+		<P196>{$user_password}</P196>
 		<!-- Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) -->   
 		<!-- Number: 0 to 63. Reboot required -->   
 		<P38>12</P38> 
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index 26db3bdce7..615be11047 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -82,7 +82,10 @@
 
 <!--  Admin password for web interface -->      
 <!--  Mandatory; between ascii values 33 and 126 -->      
-<P2>admin</P2> 
+<P2>{$admin_password}</P2>
+
+<!-- End User Password, MaxLength 32 -->
+<P196>{$user_password}</P196>
 
 <!--  Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) --> 
 <!--  Number: 0 to 63 --> 
diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml
index 3d3dddecb2..1805fa7ace 100644
--- a/resources/templates/provision/grandstream/ht701/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml
@@ -10,7 +10,11 @@
 <!-- Admin password for web interface -->
 <!-- String; between ascii values 33 and 126 -->
 <!-- Mandatory -->
-<P2>admin</P2>-->
+<!-- Admin Password for web interface, MaxLength 32 -->
+<P2>{$admin_password}</P2>
+
+<!-- End User Password, MaxLength 32 -->
+<P196>{$user_password}</P196>
 
 <!-- Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) -->
 <!-- Number: 0 to 63 --><!-- Mandatory --><P38>48</P38><!-- Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP) --><!-- Number: 0 to 4094 --><!-- Mandatory --><P51>0</P51>
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 25462ee2e3..b40caee57a 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
+<?xml version="1.0" encoding="UTF-8" ?>
 <gs_provision version="1">
 <config version="1">
 
 <!--  Configuration template for HT701 and HT702 firmware version 1.0.5.2 -->
 
-<!-- Advanced Settings. -->                                                    
+<!-- Advanced Settings. -->
 
 
 <!-- Admin password for web interface -->
 <!-- String; between ascii values 33 and 126 -->
 <!-- Mandatory -->
-<P2>admin</P2>-->
+<!-- Admin Password for web interface, MaxLength 32 -->
+<P2>{$admin_password}</P2>
+
+<!-- End User Password, MaxLength 32 -->
+<P196>{$user_password}</P196>
 
 <!-- Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) -->
 <!-- Number: 0 to 63 -->
@@ -74,7 +78,7 @@
 <!-- XML Config File Password -->
 <!-- String; between ascii values 33 and 126 -->
 <!-- Mandatory -->
-<P1359></P1359>  
+<P1359></P1359>
 
 <!-- HTTP/HTTPS User Name -->
 <!-- String; between ascii values 33 and 126 -->
@@ -99,7 +103,7 @@
 <!-- Config File Postfix -->
 <!-- String; between ascii values 33 and 126 -->
 <P235></P235>
- 
+
 <!-- Allow DHCP Option 66 to override server. 0 - No, 1 - Yes. Default is Yes. -->
 <!-- When set to Yes(1), it will override the configured provision path and method. -->
 <!-- Number: 0, 1 -->
@@ -114,29 +118,29 @@
 <!-- Check for new firmware/config file every () minutes, unit is in minute, minimum 60 minutes, default is 7 days. -->
 <!-- Number: 60 to 5256000 -->
 <!-- Mandatory -->
-<P193>10080</P193> 
+<P193>10080</P193>
 
 <!-- Automatic Upgrade. Daily at hour(0-23) -->
 <!-- Number: 0 to 23 -->
 <!-- Mandatory -->
-<P285>1</P285> 
+<P285>1</P285>
 
 <!-- Automatic Upgrade. Weekly on day (0-6) -->
 <!--  Number: 0 to 6 -->
 <!-- Mandatory -->
-<P286>1</P286> 
+<P286>1</P286>
 
 <!-- 0 = Always Check for New Firmware -->
 <!-- 1 = Check New Firmware only when F/W pre/suffix changes -->
 <!-- 2 = Always Skip the Firmware Check -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P238>0</P238> 
+<P238>0</P238>
 
 <!-- Firmware Key (AES 128, in Hexadecimal Representation) -->
 <!-- String: 0-9, a-z, A-Z -->
 <!-- Mandatory -->
-<P242></P242> 
+<P242></P242>
 
 <!-- SSL Certificate -->
 <!-- String -->
@@ -155,552 +159,552 @@
 
 <!-- ACS Username -->
 <!-- String -->
-<P4504></P4504> 
+<P4504></P4504>
 
 <!-- ACS Password -->
 <!-- String -->
-<P4505></P4505> 
+<P4505></P4505>
 
 <!-- Periodic Inform Enable 0 - No, 1 - Yes (default is No) -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4506>0</P4506> 
+<P4506>0</P4506>
 
 <!-- Periodic Inform Interval (default is 300) -->
 <!-- Number: 1-99999 -->
-<P4507>300</P4507> 
+<P4507>300</P4507>
 
 <!-- Connection Request Username -->
 <!-- String -->
-<P4511></P4511> 
+<P4511></P4511>
 
 <!-- Connection Request Password -->
 <!-- String -->
-<P4512></P4512> 
+<P4512></P4512>
 
 <!-- CPE SSL Certificate -->
-<P8220></P8220> 
+<P8220></P8220>
 
 <!-- CPE SSL Private Key -->
-<P8221></P8221> 
+<P8221></P8221>
 
 <!-- System Ring Cadence -->
 <!-- String -->
 <P4040>c=2000/4000;</P4040> -->
-<!-- Call Progress Tones -->                        
+<!-- Call Progress Tones -->
 
 <!-- Dial Tone -->
 <!-- String -->
-<P4000>f1=350@-13,f2=440@-13,c=0/0;</P4000> 
+<P4000>f1=350@-13,f2=440@-13,c=0/0;</P4000>
 
 <!-- Ringback Tone -->
 <!-- String -->
-<P4001>f1=440@-19,f2=480@-19,c=2000/4000;</P4001> 
+<P4001>f1=440@-19,f2=480@-19,c=2000/4000;</P4001>
 
 <!-- Busy Tone -->
 <!-- String -->
-<P4002>f1=480@-24,f2=620@-24,c=500/500;</P4002> 
+<P4002>f1=480@-24,f2=620@-24,c=500/500;</P4002>
 
 <!-- Reorder Tone -->
 <!-- String -->
-<P4003>f1=480@-24,f2=620@-24,c=250/250;</P4003> 
+<P4003>f1=480@-24,f2=620@-24,c=250/250;</P4003>
 
 <!-- Confirmation Tone -->
 <!-- String -->
-<P4004>f1=350@-11,f2=440@-11,c=100/100-100/100-100/100;</P4004> 
+<P4004>f1=350@-11,f2=440@-11,c=100/100-100/100-100/100;</P4004>
 
 <!-- Call Waiting tone -->
 <!-- String -->
-<P4005>f1=440@-13,c=300/300-300/10000;</P4005> 
+<P4005>f1=440@-13,c=300/300-300/10000;</P4005>
 
 <!-- Lock keypad update.  0 - No, 1 - Yes, 2( invisible on web GUI, set to 2 for Reset button - ISP Data reset allowed only).  (configuration update via keypad is disabled if set to Yes). -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P88>0</P88> 
+<P88>0</P88>
 
 <!-- Disable voice prompt. 0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P253>0</P253> 
+<P253>0</P253>
 
 <!-- Disable Direct IP Call. 0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P277>0</P277> 
+<P277>0</P277>
 
 <!-- NTP Server -->
 <!-- Server address -->
-<P30>us.pool.ntp.org</P30> 
+<P30>us.pool.ntp.org</P30>
 
 <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
 <!-- When set to Yes(1), it will override the configured NTP server. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P144>0</P144> 
+<P144>0</P144>
 
 <!-- Syslog Server (name of the server, max length is 64 characters) -->
 <!-- Server address -->
-<P207></P207> 
+<P207></P207>
 
-<!-- Syslog Level (Default setting is NONE) --> 
+<!-- Syslog Level (Default setting is NONE) -->
 <!-- 0 - NONE, 1 - DEBUG, 2 - INFO, 3 - WARNING, 4 - ERROR, 5 - EXTRA DEBUG -->
 <!-- Number: 0, 1, 2, 3, 4, 5 -->
 <!-- Mandatory -->
-<P208>0</P208> 
+<P208>0</P208>
 
 <!-- Send SIP Log. 0 - No, 1 - Yes. (If set to yes, The unit will replicate the received and send SIP packets on the syslog) -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1387>0</P1387> 
+<P1387>0</P1387>
 
-<!-- FXS PORT 1 Settings -->                                             
+<!-- FXS PORT 1 Settings -->
 
 <!-- Account Active. 0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P271>1</P271> 
+<P271>1</P271>
 
 <!-- Primary SIP Server -->
 <!-- Server address -->
-<P47>{$server_address_1}</P47> 
+<P47>{$server_address_1}</P47>
 
 <!-- Failover SIP Server -->
 <!-- Server address -->
-<P967></P967> 
+<P967></P967>
 
 <!-- Prefer Primary SIP Server. 0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4567>0</P4567> 
+<P4567>0</P4567>
 
 <!-- Outbound Proxy -->
 <!-- Server address -->
-<P48></P48> 
+<P48></P48>
 
 <!-- Allow DHCP Option 120( override SIP server )  0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1411>0</P1411> 
+<P1411>0</P1411>
 
 <!-- SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P130>0</P130> 
+<P130>0</P130>
 
 <!-- NAT Traversal (STUN) 0 - No, 2 - No but send keep-alive, 1 - Yes, 3 - UPnP -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P52>0</P52> 
+<P52>0</P52>
 
 <!-- SIP User ID -->
 <!-- String -->
-<P35>{$user_id_1}</P35> 
+<P35>{$user_id_1}</P35>
 
 <!-- Authentication ID -->
 <!-- String -->
-<P36>{$user_id_1}</P36> 
+<P36>{$user_id_1}</P36>
 
 <!-- Authentication password -->
 <!-- String -->
-<P34>{$user_password_1}</P34> 
+<P34>{$user_password_1}</P34>
 
 <!-- Name (John Doe) -->
 <!-- String -->
-<P3>{$display_name_1}</P3> 
+<P3>{$display_name_1}</P3>
 
 <!-- DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P103>0</P103> 
+<P103>0</P103>
 
 <!-- Tel URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P63>0</P63> 
+<P63>0</P63>
 
 <!-- SIP Registration. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P31>1</P31> 
+<P31>1</P31>
 
 <!-- Unregister On Reboot. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P81>0</P81> 
+<P81>0</P81>
 
 <!-- Outgoing call without Registration. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P109>1</P109> 
+<P109>1</P109>
 
 <!-- Register Expiration (in minutes. default 1 hour, max 45 days) -->
 <!-- Number: 1 to 64800 -->
 <!-- Mandatory -->
-<P32>3</P32> 
+<P32>3</P32>
 
 <!-- Reregister before Expiration (in seconds. Default 0 second) -->
 <!-- Number: 1 to 64800 -->
 <!-- Mandatory -->
-<P2330>0</P2330>  
+<P2330>0</P2330>
 
 <!-- Registration Retry Wait Time, in seconds. Between 1-3600, default is 20 -->
 <!-- Number: 1 to 3600 -->
 <!-- Mandatory -->
-<P138>20</P138> 
+<P138>20</P138>
 
 <!-- Local SIP port (default 5060) -->
 <!-- Number: 1 to 65535 -->
 <!-- Mandatory -->
-<P40>5060</P40>  
+<P40>5060</P40>
 
 <!-- Local RTP port (1024-65535, default 5004) -->
 <!-- Number: 1024 to 65535 -->
 <!-- Mandatory -->
-<P39>5004</P39> 
+<P39>5004</P39>
 
 <!-- Use Random SIP Port. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P20501>0</P20501> 
+<P20501>0</P20501>
 
 <!-- Use Random RTP Port. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P20505>0</P20505> 
+<P20505>0</P20505>
 
 <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P135>0</P135> 
+<P135>0</P135>
 
 <!-- Transfer on Conference Hangup. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4560>0</P4560>  
+<P4560>0</P4560>
 
 <!-- Enable Ring-Transfer. 0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4820>0</P4820> 
+<P4820>0</P4820>
 
 <!-- Disable Bellcore Style 3-Way Conference. 0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4830>0</P4830> 
+<P4830>0</P4830>
 
 <!-- Remove OBP from Route Header. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4562>0</P4562>  
+<P4562>0</P4562>
 
 <!-- Support SIP Instance ID. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P288>1</P288> 
+<P288>1</P288>
 
 <!-- Validate Incoming SIP Message . 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4340>0</P4340> 
+<P4340>0</P4340>
 
 <!-- Check SIP UserID for incoming INVITE. 0 - No, 1 - Yes (no direct IP calling if Yes) -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P258>0</P258> 
+<P258>0</P258>
 
 <!-- Authenticate incoming INVITE -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P2346>0</P2346> 
+<P2346>0</P2346>
 
 <!-- Allow Incoming SIP Messages from SIP Proxy Only. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P243>0</P243> 
+<P243>0</P243>
 
 <!-- Use Privacy Header. 0 - Default, 1 - No, 2 - Yes -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P2338>0</P2338> 
+<P2338>0</P2338>
 
 <!-- Use P-Preferred-Identity Header. 0 - Default, 1 - No, 2 - Yes -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P2339>0</P2339> 
+<P2339>0</P2339>
 
 <!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) -->
 <!-- 50 - 0.5 sec, 100 - 1 sec, 200 - 2 sec, 400 - 4 sec, 800 - 8 sec. Default 50. -->
 <!-- Number: 50, 100, 200, 400, 800 -->
 <!-- Mandatory -->
-<P209>50</P209> 
+<P209>50</P209>
 
 <!-- SIP T2 Interval. RFC 3261 T2 value. The maximum retransmit interval for non-INVITE requests and INVITE responses. -->
 <!-- 200 - 2 sec, 400 - 4 sec, 800 - 8 sec, 1600 - 16 sec, 3200 - 32 sec. Default 400. -->
 <!-- Number: 200, 400, 800, 1600, 3200 -->
 <!-- Mandatory -->
-<P250>400</P250> 
+<P250>400</P250>
 
 <!-- DTMF Payload Type -->
 <!-- Number: 96 to 127 -->
-<P79>101</P79> 
+<P79>101</P79>
 
 <!-- Preferred DTMF method. -->
 <!-- 100 - In-audio, 101 - RFC2833, 102 - SIP INFO -->
 <!-- Priority 1 -->
 <!-- Number: 100, 101, 102 -->
 <!-- Mandatory -->
-<P850>101</P850> 
+<P850>101</P850>
 
 <!-- Priority 2 -->
 <!-- Number: 100, 101, 102 -->
 <!-- Mandatory -->
-<P851>102</P851> 
+<P851>102</P851>
 
 <!-- Priority 3 -->
 <!-- Number: 100, 101, 102 -->
 <!-- Mandatory -->
-<P852>100</P852> 
+<P852>100</P852>
 
 <!-- Disable DTMF Negotiation. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4825>0</P4825> 
+<P4825>0</P4825>
 
 <!-- Send Hook Flash Event. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P74>0</P74> 
+<P74>0</P74>
 
 <!-- Enable Call Features. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P191>1</P191> 
+<P191>1</P191>
 
 <!-- Offhook Auto-Dial (User ID/extension to dial automatically when offhook) -->
 <!-- String: 0-9, #, * -->
 <!-- Mandatory -->
-<P71></P71> 
+<P71></P71>
 
 <!-- Offhook Auto-Dial Delay (0-60 seconds, default is 0) -->
 <!-- Number: 0 to 60 -->
-<P4045>0</P4045> 
+<P4045>0</P4045>
 
 <!-- Proxy-Require -->
 <!-- IP Address -->
-<P197></P197> 
+<P197></P197>
 
 <!-- Use NAT IP (used in SIP/SDP message if specified) -->
 <!-- IP Address -->
-<P101></P101> 
+<P101></P101>
 
 <!-- Use SIP User-Agent Header -->
-<P4834></P4834> 
+<P4834></P4834>
 
 <!-- Distinctive Ring Tone -->
-<!-- 0 - Ring Tone 1, 1 - Ring Tone 2, 2 - Ring Tone 3, 3 - Ring Tone 4, 4 - Ring Tone 5, --> 
+<!-- 0 - Ring Tone 1, 1 - Ring Tone 2, 2 - Ring Tone 3, 3 - Ring Tone 4, 4 - Ring Tone 5, -->
 <!-- 5 - Ring Tone 6, 6 - Ring Tone 7, 7 - Ring Tone 8, 8 - Ring Tone 9, 9 - Ring Tone 10 -->
 <!-- Distinctive Ring Tone Choice 1 -->
 <!-- Number: 0-9 -->
 <!-- Mandatory -->
-<P870>0</P870> 
+<P870>0</P870>
 
 <!-- Choice 1 incoming caller ID -->
 <!-- String -->
-<P871></P871> 
+<P871></P871>
 
 <!-- Distinctive Ring Tone Choice 2 -->
 <!-- Number: 0-9 -->
 <!-- Mandatory -->
-<P872>0</P872> 
+<P872>0</P872>
 
 <!-- Choice 2 incoming caller ID -->
 <!-- String -->
-<P873></P873> 
+<P873></P873>
 
 <!-- Distinctive Ring Tone Choice 3 -->
 <!-- Number: 0-9 -->
 <!-- Mandatory -->
-<P874>0</P874> 
+<P874>0</P874>
 
 <!-- Choice 3 incoming caller ID -->
 <!-- String -->
-<P875></P875> 
+<P875></P875>
 
 <!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P91>0</P91> 
+<P91>0</P91>
 
 <!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P714>0</P714> 
+<P714>0</P714>
 
 <!-- Disable Call-Waiting Tone. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P186>0</P186> 
+<P186>0</P186>
 
 <!-- Disable Receiver Offhook Tone. 0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!--  Mandatory -->
-<P4793>0</P4793> 
+<P4793>0</P4793>
 
 <!-- Disable Reminder Ring for On-Hold Call: -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4360>0</P4360> 
+<P4360>0</P4360>
 
 <!-- Disable Visual MWI. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P855>0</P855> 
+<P855>0</P855>
 
 <!-- Ring Timeout. (10-300, default is 60 seconds) -->
 <!-- Number: 10-300 -->
 <!-- Mandatory -->
-<P185>60</P185> 
+<P185>60</P185>
 
 <!-- Delayed Call Forward Wait Time. Allowed range 1-120, in seconds. Default 20 seconds. -->
 <!-- Number: 1-120 -->
 <!-- Mandatory -->
-<P139>20</P139> 
+<P139>20</P139>
 
 <!-- No Key Entry Timeout. Default - 4 seconds. -->
 <!-- Number: 1-15 -->
 <!-- Mandatory -->
-<P85>4</P85> 
+<P85>4</P85>
 
 <!-- Early Dial. 0 - No, 1 - Yes (use "Yes" only if proxy supports 484 response) -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P29>0</P29> 
+<P29>0</P29>
 
 <!-- Dial Plan Prefix.(this prefix string is added to each dialed number) -->
 <!-- String; between ascii values 33 and 126 -->
-<P66></P66> 
+<P66></P66>
 
 <!-- Use # as Dial Key. 0 - No, 1 - Yes (if set to Yes, "#" will function as the "(Re-)Dial" key) -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P72>1</P72> 
+<P72>1</P72>
 
 <!-- Dial Plan -->
 <!--  String -->
-<P4200>{ x+ | *x+ }</P4200> 
+<P4200>{ x+ | *x+ }</P4200>
 
 <!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P99>0</P99> 
+<P99>0</P99>
 
 <!-- Send Anonymous. 0 - No, 1 - Yes  (caller ID will be blocked if set to Yes) -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P65>0</P65> 
+<P65>0</P65>
 
 <!-- Anonymous Call Rejection. 0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P129>0</P129> 
+<P129>0</P129>
 
 <!-- Special Feature -->
-<!-- STANDARD = 100, BROADSOFT = 102, LUCENT = 105, CBCOM =108, RNK = 109, HUAWEI = 111, --> 
+<!-- STANDARD = 100, BROADSOFT = 102, LUCENT = 105, CBCOM =108, RNK = 109, HUAWEI = 111, -->
 <!-- ZTE_IMS = 114, PHONEPOWER = 119, TELKOM_SA = 120, VONAGE = 121 -->
 <!-- Number: 100, 102, 105, 108, 109, 111, 114, 119, 120, 121 -->
 <!-- Mandatory -->
-<P198>100</P198> 
+<P198>100</P198>
 
 <!-- Session Expiration (in seconds. default 180 seconds. Allowed value: 90-64800) -->
 <!-- Number: 90-64800 -->
 <!-- Mandatory -->
-<P260>180</P260> 
+<P260>180</P260>
 
 <!-- Minimum SE (in seconds. default 90 seconds, must be lower than or equal to P260) -->
 <!-- Number: 90-64800 -->
 <!-- Mandatory -->
-<P261>90</P261> 
+<P261>90</P261>
 
 <!-- Caller Request Timer (Request for timer when calling) 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P262>0</P262> 
+<P262>0</P262>
 
 <!-- Callee Request Timer (Request for timer when called. i.e. if remote party supports timer but did not request for one) 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P263>0</P263> 
+<P263>0</P263>
 
 <!-- Force Timer (Still use timer when remote party does not support timer) 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P264>0</P264> 
+<P264>0</P264>
 
 <!-- UAC Specify Refresher. 0 - omit, 1 - UAC, 2 - UAS -->
 <!-- Number: 0, 1, 2 -->
 <!-- Mandatory -->
-<P266>0</P266> 
+<P266>0</P266>
 
 <!-- UAS Specify Refresher. 1 - UAC, 2 - UAS -->
 <!-- Number: 1, 2 -->
 <!-- Mandatory -->
-<P267>1</P267> 
+<P267>1</P267>
 
 <!-- Force INVITE (Always refresh with INVITE instead of UPDATE even when remote party supports UPDATE) 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P265>0</P265> 
+<P265>0</P265>
 
 <!-- Send Re-INVITE After Fax. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4367>0</P4367> 
+<P4367>0</P4367>
 
 <!-- Enable 100rel. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P272>0</P272>  
+<P272>0</P272>
 
 <!-- Add Auth Header On Initial REGISTER. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P2359>0</P2359> 
+<P2359>0</P2359>
 
-<!-- Codec/Voice Quality settings -->                                          
+<!-- Codec/Voice Quality settings -->
 
 <!-- Use First Matching Vocoder in 200OK SDP. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4363>0</P4363> 
+<P4363>0</P4363>
 
 <!-- Preferred Vocoder -->
 <!-- 0 - PCMU, 8 - PCMA, 4 - G.723, 18 - G.729, 2 - G.726-32, 98 - iLBC -->
 <!-- Choice 1. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
-<P57>0</P57> 
+<P57>0</P57>
 
 <!-- Choice 2. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
-<P58>8</P58> 
+<P58>8</P58>
 
-<!-- Choice 3. --> 
+<!-- Choice 3. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
-<P59>4</P59> 
+<P59>4</P59>
 
-<!-- Choice 4. --> 
+<!-- Choice 4. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
-<P60>18</P60> 
+<P60>18</P60>
 
-<!-- Choice 5. --> 
+<!-- Choice 5. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
-<P61>2</P61> 
+<P61>2</P61>
 
-<!-- Choice 6. --> 
+<!-- Choice 6. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
 <P62>98</P62>
@@ -763,14 +767,14 @@
 <!-- Mandatory -->
 <P183>0</P183>
 
-<!-- SLIC Setting. -->   
+<!-- SLIC Setting. -->
 <!-- 0 - USA (BELLCORE 600 ohms), 3 - USA 2(BELCORE 600 ohms + 2.16uF), 11 - AUSTRAILA, 5 - CHINA CO, 6 - CHINA PBX, 4 - EUROPEAN CTR21 -->
 <!-- 9 - GERMANY, 8 -INDIA/NEW ZEALAND, 2 - JAPAN CO, 7 - JAPAN PBX, 1 - STANDARD 900 omhs, 10 - UK -->
 <!-- Number: 0-11 -->
 <!-- Mandatory -->
 <P854>0</P854>
 
-<!-- Caller ID Scheme. -->  
+<!-- Caller ID Scheme. -->
 <!-- <value=0>  Bellcore/Telcordia (default) -->
 <!-- <value=1>  ETSI-FSK during ringing	 -->
 <!-- <value=2>  ETSI-FSK prior to ringing with DTAS -->
@@ -886,23 +890,23 @@
 
 <!-- Ring Tone 1 -->
 <!-- String -->
-<P4010>c=2000/4000;</P4010> 
+<P4010>c=2000/4000;</P4010>
 
 <!-- Ring Tone 2 -->
 <!-- String -->
-<P4011>c=2000/4000;</P4011> 
+<P4011>c=2000/4000;</P4011>
 
 <!-- Ring Tone 3 -->
 <!-- String -->
-<P4012>c=2000/4000;</P4012> 
+<P4012>c=2000/4000;</P4012>
 
 <!-- Ring Tone 4 -->
 <!-- String -->
-<P4013>c=2000/4000;</P4013> 
+<P4013>c=2000/4000;</P4013>
 
 <!-- Ring Tone 5 -->
 <!-- String -->
-<P4014>c=2000/4000;</P4014> 
+<P4014>c=2000/4000;</P4014>
 
 <!-- Ring Tone 6 -->
 <!-- String -->
@@ -918,12 +922,12 @@
 
 <!-- Ring Tone 9 -->
 <!-- String -->
-<P4018>c=2000/4000;</P4018> 
+<P4018>c=2000/4000;</P4018>
 
 <!-- Ring Tone 10 -->
 <!-- String -->
 <P4019>c=2000/4000;</P4019>
-<!-- FXS PORT 2 Settings. -->             
+<!-- FXS PORT 2 Settings. -->
 
 <!--HT 702 Only -->
 
@@ -988,7 +992,7 @@
 <!-- SIP Registration. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P731>1</P731> 
+<P731>1</P731>
 
 <!-- Unregister On Reboot. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
@@ -1013,7 +1017,7 @@
 <!-- Registration Retry Wait Time, in seconds. Between 1-3600, default is 20 -->
 <!-- Number: 1 to 3600 -->
 <!-- Mandatory -->
-<P471>20</P471> 
+<P471>20</P471>
 
 <!-- Local SIP port (default 5062) -->
 <!-- Number: 1 to 65535 -->
@@ -1068,12 +1072,12 @@
 <!-- Validate Incoming SIP Message. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P4341>0</P4341> 
+<P4341>0</P4341>
 
 <!-- Check SIP User ID for incoming INVITE. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P449>0</P449> 
+<P449>0</P449>
 
 <!-- Authenticate incoming INVITE -->
 <!-- Number: 0, 1 -->
@@ -1095,7 +1099,7 @@
 <!-- Mandatory -->
 <P2439>0</P2439>
 
-<!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) --> 
+<!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) -->
 <!-- 50 - 0.5 sec, 100 - 1 sec, 200 - 2 sec, 400 - 4 sec, 800 - 8 sec. Default 50. -->
 <!-- Number: 50, 100, 200, 400, 800 -->
 <!-- Mandatory -->
@@ -1128,17 +1132,17 @@
 <!-- Mandatory -->
 <P862>100</P862>
 
-<!-- Disable DTMF Negotiation. 0 - No, 1 - Yes --> 
+<!-- Disable DTMF Negotiation. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
 <P4826>0</P4826>
 
-<!-- Send Flash Event. 0 - No, 1 - Yes --> 
+<!-- Send Flash Event. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
 <P774>0</P774>
 
-<!-- Enable Call Features. 0 - No, 1 - Yes --> 
+<!-- Enable Call Features. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
 <P751>1</P751>
@@ -1147,7 +1151,7 @@
 <!-- String: 0-9, *, # -->
 <P771></P771>
 
-<!-- Proxy-Require --> 
+<!-- Proxy-Require -->
 <!-- IP Address -->
 <P792></P792>
 
@@ -1156,7 +1160,7 @@
 <P866></P866>
 
 <!-- Distinctive Ring Tone -->
-<!-- 0 - Ring Tone 1, 1 - Ring Tone 2, 2 - Ring Tone 3, 3 - Ring Tone 4, 4 - Ring Tone 5, --> 
+<!-- 0 - Ring Tone 1, 1 - Ring Tone 2, 2 - Ring Tone 3, 3 - Ring Tone 4, 4 - Ring Tone 5, -->
 <!-- 5 - Ring Tone 6, 6 - Ring Tone 7, 7 - Ring Tone 8, 8 - Ring Tone 9, 9 - Ring Tone 10 -->
 <!-- Distinctive Ring Tone Choice 1 -->
 <!-- Number: 0-9 -->
@@ -1213,7 +1217,7 @@
 <!-- Disable Visual MWI. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P869>0</P869> 
+<P869>0</P869>
 
 <!-- Ring Timeout. (10-300, default is 60 seconds) -->
 <!-- Number: 10-300 -->
@@ -1263,7 +1267,7 @@
 <!-- Mandatory -->
 <P446>0</P446>
 
-<!-- Special Feature --> 
+<!-- Special Feature -->
 <!-- STANDARD = 100, BROADSOFT = 102, LUCENT = 105, CBCOM =108, RNK = 109, HUAWEI = 111, ZTE_IMS = 114, PHONEPOWER = 119, TELKOM_SA = 120, VONAGE = 121 -->
 <!-- Number: 100, 102, 105, 108, 109, 111, 114, 119, 120, 121 -->
 <P767>100</P767>
@@ -1271,7 +1275,7 @@
 <!-- Session Expiration (in seconds. default 180 seconds. Allowed value: 90-64800) -->
 <!-- Number: 90-64800 -->
 <!-- Mandatory -->
-<P434>180</P434> 
+<P434>180</P434>
 
 <!-- Minimum SE (in seconds. default 90 seconds, must be lower than or equal to P260) -->
 <!-- Number: 90-64800 -->
@@ -1323,7 +1327,7 @@
 <!-- Mandatory -->
 <P2459>0</P2459>
 
-<!-- Codec/Voice Quality settings -->                                                
+<!-- Codec/Voice Quality settings -->
 
 <!-- Use First Matching Vocoder in 200OK SDP. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
@@ -1332,7 +1336,7 @@
 
 <!-- Preferred Vocoder -->
 <!-- 0 - PCMU, 8 - PCMA, 4 - G.723, 18 - G.729, 2 - G.726-32, 98 - iLBC -->
-<!-- Choice 1. --> 
+<!-- Choice 1. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
 <P757>0</P757>
@@ -1352,12 +1356,12 @@
 <!-- Mandatory -->
 <P760>18</P760>
 
-<!-- Choice 5. --> 
+<!-- Choice 5. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
 <P761>2</P761>
 
-<!-- Choice 6. --> 
+<!-- Choice 6. -->
 <!-- Number: 0, 2, 4, 8, 18, 98 -->
 <!-- Mandatory -->
 <P762>98</P762>
@@ -1382,7 +1386,7 @@
 <!-- Mandatory -->
 <P704>97</P704>
 
-<!-- VAD. 0 - No, 1 - Yes --> 
+<!-- VAD. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
 <P750>0</P750>
@@ -1420,14 +1424,14 @@
 <!-- Mandatory -->
 <P443>0</P443>
 
-<!-- SLIC Setting. -->   
+<!-- SLIC Setting. -->
 <!-- 0 - USA (BELLCORE 600 ohms), 1 - STANDARD 900 ohms, 2 - JAPAN CO, 3 - USA 2 (BELLCORE 600 ohms + 2.16uF), 4 - EUROPEAN CTR21, 5 - CHINA CO -->
 <!-- 6 - CHINA PBX, 7 -JAPAN PBX, 8 - INDIA/NEW ZEALAND, 9 - GERMANY, 10 - UK, 11 - AUSTRALIA, -->
 <!-- Number: 0 to 11 -->
 <!-- Mandatory -->
 <P864>0</P864>
 
-<!-- Caller ID Scheme. -->  
+<!-- Caller ID Scheme. -->
 <!-- <value=0>  Bellcore/Telcordia (default) -->
 <!-- <value=1>  ETSI-FSK during ringing	-->
 <!-- <value=2>  ETSI-FSK prior to ringing with DTAS -->
@@ -1517,9 +1521,9 @@
 <!-- <value=6> -6dB -->
 <!-- Number: 0, 1, 2, 3, 4, 5, 6 -->
 <!-- Mandatory -->
-<P248>0</P248> 
+<P248>0</P248>
 
-<!-- RX --> 
+<!-- RX -->
 <!-- <value=1> +6dB -->
 <!-- <value=2> +4dB -->
 <!-- <value=3> +2dB -->
@@ -1538,31 +1542,31 @@
 
 <!-- Ring Tone 1 -->
 <!-- String -->
-<P4030>c=2000/4000;</P4030> 
+<P4030>c=2000/4000;</P4030>
 
 <!-- Ring Tone 2 -->
 <!-- String -->
-<P403>c=2000/4000;</P403> 
+<P403>c=2000/4000;</P403>
 
 <!-- Ring Tone 3 -->
 <!-- String -->
-<P4032>c=2000/4000;</P4032> 
+<P4032>c=2000/4000;</P4032>
 
 <!-- Ring Tone 4 -->
 <!-- String -->
-<P4033>c=2000/4000;</P4033> 
+<P4033>c=2000/4000;</P4033>
 
 <!-- Ring Tone 5 -->
 <!-- String -->
-<P4034>c=2000/4000;</P4034> 
+<P4034>c=2000/4000;</P4034>
 
 <!-- Ring Tone 6 -->
 <!-- String -->
-<P4035>c=2000/4000;</P4035> 
+<P4035>c=2000/4000;</P4035>
 
 <!-- Ring Tone 7 -->
 <!-- String -->
-<P4036>c=2000/4000;</P4036> 
+<P4036>c=2000/4000;</P4036>
 
 <!-- Ring Tone 8 -->
 <!-- String -->
@@ -1576,7 +1580,7 @@
 <!-- String -->
 <P4039>c=2000/4000;</P4039>
 
-<!-- Basic Settings.  -->                                                        
+<!-- Basic Settings.  -->
 
 <!-- End User Password -->
 <!-- String -->
@@ -1656,7 +1660,7 @@
 
 <!-- Static IP -->
 <!-- IP Address. Ignore if DHCP or PPPoE is used -->
-<!-- Number: 0 to 255 --> 
+<!-- Number: 0 to 255 -->
 <!-- P9=192 -->
 <!-- P10=168 -->
 <!-- P11=0 -->
diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index ef48de1793..35f6b1cc7f 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -10,7 +10,11 @@
 
 <!-- Admin password for web interface -->
 <!-- String -->
-<P2>admin</P2>
+<!-- Admin Password for web interface, MaxLength 32 -->
+<P2>{$admin_password}</P2>
+
+<!-- End User Password, MaxLength 32 -->
+<P196>{$user_password}</P196>
 
 <!-- Layer 3 QoS (IP Diff-Serv or Precedence value for RTP) -->
 <!-- Number: 0 to 63 -->