diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 403d7ab94c..eef0bc1e7c 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3058,7 +3058,7 @@ Account 5 Codec Settings
 <P143>0</P143>
 
 <!-- Time Zone -->
-<!-- Web GUI Option P Value- -->							
+<!-- Web GUI Option P Value- -->
 <!-- GMT+12:00(Tuvalu Time) TZA+12 -->
 <!-- GMT+12:00(Marshall Islands) MHT-12 -->
 <!-- GMT-11:00(Midway Island) TZB+11 -->
@@ -3074,8 +3074,8 @@ Account 5 Codec Settings
 <!-- GMT-5:00(Mexico City) CST6CDT,M4.1.0,M10.5.0 -->
 <!-- *GMT-6:00(Saskatchewan) -->
 <!-- GMT-5:00(Bogota)	COT5 -->
-<!-- GMT-5:00(Estern Time without daylight saving) EST5 -->
-<!-- GMT-4:00(Estern Time) EST5EDT -->
+<!-- GMT-5:00(Eastern Time without daylight saving) EST5 -->
+<!-- GMT-4:00(Eastern Time) EST5EDT -->
 <!-- GMT-4:30(Venezuela) TZf+4:30 -->
 <!-- GMT-4:00(Atlantic Time) AST4ADT -->
 <!-- GMT-4:00(Manaus) AMT4 -->
@@ -3122,7 +3122,7 @@ Account 5 Codec Settings
 <!-- GMT+5:00(Ural'sk)	ORAT-5 -->
 <!-- GMT+6:00(Yekaterinburg) YEKT-5YEKST,M3.5.0,M10.5.0/3 -->
 <!-- GMT+5:30(Kolkata)	IST-5:30 -->
-<!-- *GMT+5:30(Sri Lanka) -->			
+<!-- *GMT+5:30(Sri Lanka) -->
 <!-- GMT+5:45(Kathmandu)TZU-5:45 -->
 <!-- GMT+6:00(Astana)	TZV-6 -->
 <!-- GMT+6:30(Yangon)	TZW-6:30 -->
@@ -3147,16 +3147,17 @@ Account 5 Codec Settings
 <!-- GMT+10:00(Sydney, Canberra)EST-10EDT-11,M10.5.0/02:00:00,M3.5.0/03:00:00 -->
 <!-- GMT+11:00(Vladivostok)	VLAT-10VLAST,M3.5.0,M10.5.0/3 -->
 <!-- GMT+10:00(Guam)		TZb-10 -->
-<!-- GMT+12:00(Magadan)		TZc-11 --> 								
+<!-- GMT+12:00(Magadan)		TZc-11 -->
 <!-- GMT+12:00(Auckland)	NZST-12NZDT-13,M10.1.0/02:00:00,M3.3.0/03:00:00 -->
 <!-- GMT+12:00(Fiji)		TZd-12 -->
 <!-- GMT+13:00(Tonga) TZe-13 -->
 
 <!-- P64 = PST8PDT -->
+<P64>{$grandstream_gxp_time_zone}</P64>
 
 <!-- Time Display Format. 0 - 12 Hour, 1 - 24 Hour. Default value is 1 -->
 <!-- Number: 0, 1 -->
-<P122>1</P122>
+<P122>{$grandstream_gxp_time_format}</P122>
 
 <!-- Date Display Format. Default value is 1 -->
 <!-- 0: YY-MM-DD -->
@@ -3164,7 +3165,7 @@ Account 5 Codec Settings
 <!-- 2: DD-MM-YY -->
 <!-- 3: Normal (M-D-YY) -->
 <!-- Number: 0, 1, 2, 3 -->
-<P102>1</P102>
+<P102>{$grandstream_gxp_date_format}</P102>
 
 <!-- Maintenance - Web/SSH Access -->