diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index b3d783b538..526896fd34 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -126,7 +126,7 @@
 <P35>{$account.1.user_id}</P35>
 
 <!-- Authenticate ID -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- Authenticate Password -->
 <P34>{$account.1.password}</P34>
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 0c8b23a85e..65eb8ebe8c 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -27,7 +27,7 @@
 
 
 <!-- SIP Authenticate ID -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- SIP Authenticate Password -->
 <P34>{$account.1.password}</P34>
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index 1d9cfa7da0..a6e1bf8e93 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -244,7 +244,7 @@
 
 
 <!-- SIP Authenticate ID -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- SIP Authenticate Password -->
 <P34>{$account.1.password}</P34>
diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
index e032e9356c..bd93b86373 100644
--- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
@@ -213,7 +213,7 @@
     <!-- SIP User ID -->
     <P35>{$account.1.user_id}</P35>
     <!-- Authenticate ID -->
-    <P36>{$account.1.user_id}</P36>
+    <P36>{$account.1.auth_id}</P36>
     <!-- Authenticate password -->
     <P34>{$account.1.password}</P34>
     <!-- Display Name (John Doe) -->
diff --git a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
index 9605ca112d..0a80c906bd 100644
--- a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
@@ -83,7 +83,7 @@
 <P35>{$account.1.user_id}</P35>
 
 <!--  Authenticate ID, MaxLength 64 characters -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!--  Authenticate Password, MaxLength unlimited -->
 <P34>{$account.1.password}</P34>
diff --git a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
index 6e2c8f24f5..6213a4f354 100644
--- a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
@@ -31,7 +31,7 @@
 <P35>{$account.1.user_id}</P35>
 
 <!-- Authenticate ID, MaxLength 64 characters -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- Authenticate Password, Maxlength: unlimited -->
 <P34>{$account.1.password}</P34>
diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
index 3cea159adf..81ccf85ad7 100644
--- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
@@ -52,7 +52,7 @@
     <!-- SIP User ID, MaxLength 64 characters -->
     <P35>{$account.1.user_id}</P35>
     <!-- Authenticate ID, MaxLength 64 characters -->
-    <P36>{$account.1.user_id}</P36>
+    <P36>{$account.1.auth_id}</P36>
     <!-- Authenticate Password, MaxLength unlimited -->
     <P34>{$account.1.password}</P34>
     <!-- Voicemail UserID (User ID/extension for 3rd Party voice mail system), MaxLength 64 characters -->
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index 2f8767f656..f4430cf459 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -33,7 +33,7 @@
 <P35>{$account.1.user_id}</P35>
 
 <!-- SIP Authentication ID -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- SIP Authentication Password -->
 <P34>{$account.1.password}</P34>
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index f7d156e3b1..88ac2c8a9c 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -247,7 +247,7 @@
 
 
 <!-- SIP Authenticate ID -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- SIP Authenticate Password -->
 <P34>{$account.1.password}</P34>
diff --git a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
index e27719804d..92febdb654 100644
--- a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
@@ -487,7 +487,7 @@
 <P35>{$account.1.user_id}</P35>
 
 <!-- SIP authenticate id-->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- SIP stun server -->
 <P76></P76>
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index 1b0df6f328..8ee19221fe 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -421,7 +421,7 @@
 
 <!--  Authentication ID -->
 <!--  String -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!--  Authentication password -->
 <!--  String -->
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index eb7bcf52cd..251fcd5944 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -326,7 +326,7 @@
 
 <!-- Authentication ID -->
 <!-- String -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- Authentication password -->
 <!-- String -->
diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml
index dd1d825d2e..0916d0fa72 100644
--- a/resources/templates/provision/grandstream/ht801/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml
@@ -619,7 +619,7 @@
 
 <!-- Authentication ID -->
 <!-- String -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- Authentication password -->
 <!-- String -->
diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml
index 5c3cb97597..de86db987d 100644
--- a/resources/templates/provision/grandstream/ht802/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml
@@ -619,7 +619,7 @@
 
 <!-- Authentication ID -->
 <!-- String -->
-<P36>{$account.1.user_id}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- Authentication password -->
 <!-- String -->