From 1d9694a6710864012c55e0db5b4d7c5c21c18617 Mon Sep 17 00:00:00 2001
From: demonspork <demonspork@gmail.com>
Date: Thu, 25 Feb 2021 17:10:49 -0600
Subject: [PATCH] Grandstream template nway conference support

Support enabling nway conference with Grandstream phones if nway_conference is set to true. If it is not true, it sets the conference URI back to blank to restore local conference
---
 .../provision/grandstream/gac2500/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/grp2612/{$mac}.xml         |  4 ++--
 .../provision/grandstream/grp2612w/{$mac}.xml        |  4 ++--
 .../provision/grandstream/grp2613/{$mac}.xml         |  6 +++---
 .../provision/grandstream/grp2614/{$mac}.xml         |  8 ++++----
 .../provision/grandstream/grp2615/{$mac}.xml         | 10 +++++-----
 .../provision/grandstream/grp2616/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/grp26xx/{$mac}.xml         | 10 +++++-----
 .../provision/grandstream/gxp110x/{$mac}.xml         |  2 +-
 .../provision/grandstream/gxp116x/{$mac}.xml         |  2 +-
 .../provision/grandstream/gxp140x/{$mac}.xml         |  4 ++--
 .../provision/grandstream/gxp140xbk/{$mac}.xml       |  4 ++--
 .../provision/grandstream/gxp1450/{$mac}.xml         |  4 ++--
 .../provision/grandstream/gxp1450bk/{$mac}.xml       |  4 ++--
 .../provision/grandstream/gxp16xx/{$mac}.xml         |  6 +++---
 .../provision/grandstream/gxp17xx/{$mac}.xml         |  6 +++---
 .../provision/grandstream/gxp2100/{$mac}.xml         |  8 ++++----
 .../provision/grandstream/gxp2124/{$mac}.xml         |  8 ++++----
 .../provision/grandstream/gxp2130/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp2135/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp2140/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp2160/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp2170/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp21xx/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp21xxbk/{$mac}.xml       | 12 ++++++------
 .../provision/grandstream/gxp2200/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp3240/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxv3240/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxv3275/{$mac}.xml         | 12 ++++++------
 .../templates/provision/grandstream/ht802/{$mac}.xml |  4 ++--
 .../templates/provision/grandstream/ht818/{$mac}.xml |  2 +-
 31 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
index 841f113a0a..8dd06e73ec 100644
--- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
@@ -488,7 +488,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Account Ring Tone. See ring tone options and value in the Ring Tone Value Table below -->
    	{if isset($grandstream_account_ring_tone_1)}
@@ -1056,7 +1056,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120. -->
@@ -1624,7 +1624,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120 -->
@@ -2193,7 +2193,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
     
@@ -2764,7 +2764,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120 -->
@@ -3335,7 +3335,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120 -->
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index a1c853a549..17b96b97b6 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index 1a1cd241e1..b07a8c6bf0 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 4cab49735a..d83d74b3f2 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 0928140e6d..6f09f19fab 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3205,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index e3d2626e5f..7379be4bfa 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3205,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4155,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index c5857ad26f..a96bf96f40 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3205,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4155,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5105,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
index 3bea13d1bb..685117885e 100644
--- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
@@ -350,7 +350,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1326,7 +1326,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2293,7 +2293,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3262,7 +3262,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4233,7 +4233,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
index 5b166acd4a..93e200b3c6 100644
--- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
@@ -353,7 +353,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Music On Hold URI -->
 <!-- String -->
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index 52b8eccfd1..52b24aa782 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -227,7 +227,7 @@
 
 <!--  Conference URI -->
 <!--  String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!--  Music On Hold URI -->
 <!--  String -->
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index 654bf96fe5..f8f00e0771 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -302,7 +302,7 @@
     <P134></P134>
     <!--  Conference URI -->
     <!--  String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
     <!--  Music On Hold URI -->
     <!--  String -->
     <P2350></P2350>
@@ -736,7 +736,7 @@
     <P444></P444>
     <!--  Conference URI -->
     <!--  String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
     <!--  Music On Hold URI -->
     <!--  String -->
     <P2450></P2450>
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index db3979a52d..7cdb0d0d41 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -302,7 +302,7 @@
     <P134></P134>
     <!--  Conference URI -->
     <!--  String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
     <!--  Music On Hold URI -->
     <!--  String -->
     <P2350></P2350>
@@ -736,7 +736,7 @@
     <P444></P444>
     <!--  Conference URI -->
     <!--  String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
     <!--  Music On Hold URI -->
     <!--  String -->
     <P2450></P2450>
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index f6346b76cf..e25b624d8f 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -417,7 +417,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -974,7 +974,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Music On Hold URI -->
 <!-- String -->
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index 101ab84d48..087c8753f5 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -226,7 +226,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -783,7 +783,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Music On Hold URI -->
 <!-- String -->
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index 656d33b3be..a5b3e96e63 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -264,7 +264,7 @@
 <P188>0</P188>
 <!--  Conference URI -->
 <!--  String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 <!--  Music On Hold URI -->
 <!--  String -->
 <P2350></P2350>
@@ -872,7 +872,7 @@
 <P488>0</P488>
 <!--  Conference URI -->
 <!--  String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 <!--  Music On Hold URI -->
 <!--  String -->
 <P2450></P2450>
@@ -1445,7 +1445,7 @@
 <P2589>0</P2589>
 <!--  Conference URI -->
 <!--  String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 <!--  Music On Hold URI -->
 <!--  String -->
 <P2550></P2550>
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index e2acafe9ba..5ac1381004 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -1034,7 +1034,7 @@
 
 <!-- # Conference URI -->
 <!-- # String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- # Music On Hold URI -->
 <!-- # String -->
@@ -1745,7 +1745,7 @@
 
 <!-- # Conference URI -->
 <!-- # String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- # Music On Hold URI -->
 <!-- # String -->
@@ -2445,7 +2445,7 @@
 
 <!-- # Conference URI -->
 <!-- # String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- # Music On Hold URI -->
 <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index f3457360c9..f31ed53034 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -263,7 +263,7 @@
 
 <!--# Conference URI-->
 <!--# String-->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!--# Music On Hold URI-->
 <!--# String-->
@@ -893,7 +893,7 @@
 
 <!--# Conference URI-->
 <!--# String-->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!--# Music On Hold URI-->
 <!--# String-->
@@ -1521,7 +1521,7 @@
 
 <!--# Conference URI-->
 <!--# String-->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!--# Music On Hold URI-->
 <!--# String-->
@@ -2147,7 +2147,7 @@
 
 <!--# Conference URI-->
 <!--# String-->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!--# Music On Hold URI-->
 <!--# String-->
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 4bcf7a47f3..6fb3562d74 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -178,7 +178,7 @@
     <P134></P134>
     <!-- Conference URI -->
     <!-- String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2350></P2350>
@@ -616,7 +616,7 @@
     <P444></P444>
     <!-- Conference URI-->
     <!-- String-->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
     <!-- Music On Hold URI-->
     <!-- String-->
     <P2450></P2450>
@@ -1049,7 +1049,7 @@
     <P544></P544>
     <!-- Conference URI -->
     <!-- String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2550></P2550>
@@ -1480,7 +1480,7 @@
     <P644></P644>
     <!-- Conference URI -->
     <!-- String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
     <!-- Music On Hold -->
     <!-- String -->
     <P2650></P2650>
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index f8c77500dd..de7cac7654 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3205,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4155,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5105,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 54e4f726e0..d4ce8092ae 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3205,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4155,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5105,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 0c56f45796..2c10d80f40 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3205,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4155,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5105,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 14113e9cc5..2824da66e6 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3205,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4155,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5105,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 617bfb0179..90aa2ed743 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1308,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2256,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3205,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4155,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5105,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 06291563af..55d86634a0 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -122,7 +122,7 @@
     <P134></P134>
     <!-- Conference URI -->
     <!-- String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2350></P2350>
@@ -559,7 +559,7 @@
     <P444></P444>
     <!-- Conference URI -->
     <!-- String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2450></P2450>
@@ -991,7 +991,7 @@
     <P544></P544>
     <!-- Conference URI -->
     <!-- String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2550></P2550>
@@ -1421,7 +1421,7 @@
     <P644></P644>
     <!-- Conference URI -->
     <!-- String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2650></P2650>
@@ -1845,7 +1845,7 @@
     <P1744></P1744>
     <!-- Conference URI -->
     <!-- String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2750></P2750>
@@ -2276,7 +2276,7 @@
     <P1844></P1844>
     <!-- Conference URI -->
     <!-- String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2850></P2850>
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index 66bde7e9f3..b9f859e185 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -272,7 +272,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -836,7 +836,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -1399,7 +1399,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -1955,7 +1955,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -2505,7 +2505,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -3062,7 +3062,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Music On Hold URI -->
 <!-- String -->
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 9b1cf9c7ef..1f52a9d0ef 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -344,7 +344,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -762,7 +762,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1190,7 +1190,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1620,7 +1620,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
 <P623>content://settings/system/ringtone</P623>
@@ -2045,7 +2045,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -2471,7 +2471,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index ad6099c077..f72f4e96b0 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -555,7 +555,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -973,7 +973,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1401,7 +1401,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1831,7 +1831,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
 <P623>content://settings/system/ringtone</P623>
@@ -2256,7 +2256,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -2682,7 +2682,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index e20791bf76..f7587b6e3f 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -600,7 +600,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1255,7 +1255,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1893,7 +1893,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -2534,7 +2534,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3173,7 +3173,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3814,7 +3814,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index d3c41f54f2..db27fe0002 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -560,7 +560,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -978,7 +978,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1406,7 +1406,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1836,7 +1836,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
 <P623>content://settings/system/ringtone</P623>
@@ -2261,7 +2261,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -2687,7 +2687,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml
index cc6672c368..63526f3143 100644
--- a/resources/templates/provision/grandstream/ht802/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml
@@ -1109,7 +1109,7 @@
     <P2359>0</P2359>
 
     <!-- # Conference URI -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- ################################################################################# -->
     <!-- # Codec/Voice Quality settings                                                  # -->
@@ -1987,7 +1987,7 @@
     <P2459>0</P2459>
 
     <!-- #Conference URI -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- ################################################################################# -->
     <!-- # Codec/Voice Quality settings                                                  # -->
diff --git a/resources/templates/provision/grandstream/ht818/{$mac}.xml b/resources/templates/provision/grandstream/ht818/{$mac}.xml
index fae40cd009..88f170f8d4 100644
--- a/resources/templates/provision/grandstream/ht818/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht818/{$mac}.xml
@@ -1048,7 +1048,7 @@
     <P2359>0</P2359>
 
     <!-- # Conference URI -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- ################################################################################# -->
     <!-- # Codec/Voice Quality settings                                                  # -->