diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 7d247f9d77..0ab0b1ee04 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -4,7 +4,7 @@
 <mac>{$mac|replace:'-':''}</mac>
   <config version="1">
     <!-- ########################################################################################## -->
-    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.9.127    ## -->
+    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.10.35    ## -->
     <!-- ########################################################################################## -->
 
     <!-- #################################################################### -->
@@ -62,7 +62,11 @@
 
     <!-- # SIP User ID -->
     <!-- # String -->
+{if isset($account.1.server_address_secondary)}
+    <P35>{$account.1.user_id}@{$account.1.server_address}</P35>
+{else}
     <P35>{$account.1.user_id}</P35>
+{/if}
 
     <!-- # Authenticate ID -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 3dd7b2df71..744e398677 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -4,7 +4,7 @@
 <mac>{$mac|replace:'-':''}</mac>
   <config version="1">
     <!-- ########################################################################################## -->
-    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.9.127    ## -->
+    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.10.35    ## -->
     <!-- ########################################################################################## -->
 
     <!-- #################################################################### -->
@@ -62,7 +62,11 @@
 
     <!-- # SIP User ID -->
     <!-- # String -->
+{if isset($account.1.server_address_secondary)}
+    <P35>{$account.1.user_id}@{$account.1.server_address}</P35>
+{else}
     <P35>{$account.1.user_id}</P35>
+{/if}
 
     <!-- # Authenticate ID -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 13909660cb..bf619b98c7 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -4,7 +4,7 @@
 <mac>{$mac|replace:'-':''}</mac>
   <config version="1">
     <!-- ########################################################################################## -->
-    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.9.127    ## -->
+    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.10.35    ## -->
     <!-- ########################################################################################## -->
 
     <!-- #################################################################### -->
@@ -62,7 +62,11 @@
 
     <!-- # SIP User ID -->
     <!-- # String -->
+{if isset($account.1.server_address_secondary)}
+    <P35>{$account.1.user_id}@{$account.1.server_address}</P35>
+{else}
     <P35>{$account.1.user_id}</P35>
+{/if}
 
     <!-- # Authenticate ID -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 1d49bcc71d..ea266dabf6 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -4,7 +4,7 @@
 <mac>{$mac|replace:'-':''}</mac>
   <config version="1">
     <!-- ########################################################################################## -->
-    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.9.127    ## -->
+    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.10.35    ## -->
     <!-- ########################################################################################## -->
 
     <!-- #################################################################### -->
@@ -62,7 +62,11 @@
 
     <!-- # SIP User ID -->
     <!-- # String -->
+{if isset($account.1.server_address_secondary)}
+    <P35>{$account.1.user_id}@{$account.1.server_address}</P35>
+{else}
     <P35>{$account.1.user_id}</P35>
+{/if}
 
     <!-- # Authenticate ID -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 774b274e3d..8ff60f4ffa 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -4,7 +4,7 @@
 <mac>{$mac|replace:'-':''}</mac>
   <config version="1">
     <!-- ########################################################################################## -->
-    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.9.127    ## -->
+    <!-- ## Configuration Template For GXP2130/2140/2160/2170/2135 Firmware Version 1.0.10.35    ## -->
     <!-- ########################################################################################## -->
 
     <!-- #################################################################### -->
@@ -62,7 +62,11 @@
 
     <!-- # SIP User ID -->
     <!-- # String -->
+{if isset($account.1.server_address_secondary)}
+    <P35>{$account.1.user_id}@{$account.1.server_address}</P35>
+{else}
     <P35>{$account.1.user_id}</P35>
+{/if}
 
     <!-- # Authenticate ID -->
     <!-- # String -->