-
+
diff --git a/resources/templates/provision/panasonic/ut670/{$mac}.cfg b/resources/templates/provision/panasonic/ut670/{$mac}.cfg
index f56a3e54ac..31ed3adddb 100644
--- a/resources/templates/provision/panasonic/ut670/{$mac}.cfg
+++ b/resources/templates/provision/panasonic/ut670/{$mac}.cfg
@@ -361,12 +361,12 @@ DISPLAY_NAME_3="{$display_name_3}"
DISPLAY_NAME_4="{$display_name_4}"
DISPLAY_NAME_5="{$display_name_5}"
DISPLAY_NAME_6="{$display_name_6}"
-VM_NUMBER_1="*97"
-VM_NUMBER_2="*97"
-VM_NUMBER_3="*97"
-VM_NUMBER_4="*97"
-VM_NUMBER_5="*97"
-VM_NUMBER_6="*97"
+VM_NUMBER_1="{$voicemail_number}"
+VM_NUMBER_2="{$voicemail_number}"
+VM_NUMBER_3="{$voicemail_number}"
+VM_NUMBER_4="{$voicemail_number}"
+VM_NUMBER_5="{$voicemail_number}"
+VM_NUMBER_6="{$voicemail_number}"
DIAL_PLAN_1="1XXXXXXXXXX|X11|480XXXXXXX|602XXXXXXX|623XXXXXXX"
DIAL_PLAN_2="1XXXXXXXXXX|X11|480XXXXXXX|602XXXXXXX|623XXXXXXX"
DIAL_PLAN_3="1XXXXXXXXXX|X11|480XXXXXXX|602XXXXXXX|623XXXXXXX"
diff --git a/resources/templates/provision/poly/poly-vvx-d230/{$mac}.xml b/resources/templates/provision/poly/poly-vvx-d230/{$mac}.xml
index 9ea857ad58..0954ef9afa 100644
--- a/resources/templates/provision/poly/poly-vvx-d230/{$mac}.xml
+++ b/resources/templates/provision/poly/poly-vvx-d230/{$mac}.xml
@@ -8358,7 +8358,7 @@
VoiceService.1.VoiceProfile.1.X_FeatureCode.
DirectedCallPickup
-
+
CallPickup
@@ -8898,7 +8898,7 @@
VoiceService.1.VoiceProfile.2.X_FeatureCode.
DirectedCallPickup
-
+
CallPickup
@@ -9438,7 +9438,7 @@
VoiceService.1.VoiceProfile.3.X_FeatureCode.
DirectedCallPickup
-
+
CallPickup
@@ -9978,7 +9978,7 @@
VoiceService.1.VoiceProfile.4.X_FeatureCode.
DirectedCallPickup
-
+
CallPickup
@@ -10518,7 +10518,7 @@
VoiceService.1.VoiceProfile.5.X_FeatureCode.
DirectedCallPickup
-
+
CallPickup
@@ -11058,7 +11058,7 @@
VoiceService.1.VoiceProfile.6.X_FeatureCode.
DirectedCallPickup
-
+
CallPickup
@@ -11598,7 +11598,7 @@
VoiceService.1.VoiceProfile.7.X_FeatureCode.
DirectedCallPickup
-
+
CallPickup
@@ -12138,7 +12138,7 @@
VoiceService.1.VoiceProfile.8.X_FeatureCode.
DirectedCallPickup
-
+
CallPickup
diff --git a/resources/templates/provision/polycom/650/sip.cfg b/resources/templates/provision/polycom/650/sip.cfg
index f8b2faf45d..8df3e3dbcf 100644
--- a/resources/templates/provision/polycom/650/sip.cfg
+++ b/resources/templates/provision/polycom/650/sip.cfg
@@ -274,7 +274,7 @@
-
+
@@ -723,4 +723,4 @@
-
\ No newline at end of file
+
diff --git a/resources/templates/provision/polycom/650/{$mac}-registration.cfg b/resources/templates/provision/polycom/650/{$mac}-registration.cfg
index d45ff55368..3613518262 100644
--- a/resources/templates/provision/polycom/650/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/650/{$mac}-registration.cfg
@@ -69,7 +69,7 @@
-
+
@@ -723,4 +723,4 @@
-
\ No newline at end of file
+
diff --git a/resources/templates/provision/polycom/8030/{$mac}-registration.cfg b/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
index d45ff55368..3613518262 100644
--- a/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
@@ -69,7 +69,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -153,7 +153,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -282,7 +282,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -411,7 +411,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -540,7 +540,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -669,7 +669,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
diff --git a/resources/templates/provision/sangoma/s500/{$mac}.xml b/resources/templates/provision/sangoma/s500/{$mac}.xml
index 99eb3986fc..acbaaee1c2 100644
--- a/resources/templates/provision/sangoma/s500/{$mac}.xml
+++ b/resources/templates/provision/sangoma/s500/{$mac}.xml
@@ -24,7 +24,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -153,7 +153,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -282,7 +282,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -411,7 +411,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -540,7 +540,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -669,7 +669,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
diff --git a/resources/templates/provision/sangoma/s700/{$mac}.xml b/resources/templates/provision/sangoma/s700/{$mac}.xml
index 64cb023765..c3b185a1b6 100644
--- a/resources/templates/provision/sangoma/s700/{$mac}.xml
+++ b/resources/templates/provision/sangoma/s700/{$mac}.xml
@@ -24,7 +24,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -153,7 +153,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -282,7 +282,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -411,7 +411,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -540,7 +540,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
@@ -669,7 +669,7 @@
1
1
- *97
+ {$voicemail_number}
1
1
0
diff --git a/resources/templates/provision/vtech/vcs754/{$mac}.cfg b/resources/templates/provision/vtech/vcs754/{$mac}.cfg
index fb3934c3f1..246c29d2eb 100644
--- a/resources/templates/provision/vtech/vcs754/{$mac}.cfg
+++ b/resources/templates/provision/vtech/vcs754/{$mac}.cfg
@@ -88,7 +88,7 @@ sip_account.1.primary_registration_expires = 3600
sip_account.1.access_code_page =
sip_account.1.access_code_park_call =
sip_account.1.access_code_retrieve_parked_call =
-sip_account.1.access_code_retrieve_voicemail = *97
+sip_account.1.access_code_retrieve_voicemail = {$voicemail_number}
sip_account.1.access_code_dnd_on = *78
sip_account.1.access_code_dnd_off = *79
sip_account.1.access_code_cfa_on = *72
@@ -167,7 +167,7 @@ sip_account.2.primary_registration_expires = 3600
sip_account.2.access_code_page =
sip_account.2.access_code_park_call =
sip_account.2.access_code_retrieve_parked_call =
-sip_account.2.access_code_retrieve_voicemail = *97
+sip_account.2.access_code_retrieve_voicemail = {$voicemail_number}
sip_account.2.access_code_dnd_on = *78
sip_account.2.access_code_dnd_off = *79
sip_account.2.access_code_cfa_on = *72
@@ -246,7 +246,7 @@ sip_account.3.primary_registration_expires = 3600
sip_account.3.access_code_page =
sip_account.3.access_code_park_call =
sip_account.3.access_code_retrieve_parked_call =
-sip_account.3.access_code_retrieve_voicemail = *97
+sip_account.3.access_code_retrieve_voicemail = {$voicemail_number}
sip_account.3.access_code_dnd_on = *78
sip_account.3.access_code_dnd_off = *79
sip_account.3.access_code_cfa_on = *72
diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg
index e07671ec6a..cf72b3b727 100644
--- a/resources/templates/provision/yealink/cp860/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg
@@ -667,7 +667,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1182,7 +1182,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1682,7 +1682,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2179,7 +2179,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2675,7 +2675,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/cp920/{$mac}.cfg b/resources/templates/provision/yealink/cp920/{$mac}.cfg
index 587aef24b3..1c8ae2d7e0 100644
--- a/resources/templates/provision/yealink/cp920/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp920/{$mac}.cfg
@@ -666,7 +666,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1182,7 +1182,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1684,7 +1684,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2182,7 +2182,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2679,7 +2679,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/cp960/{$mac}.cfg b/resources/templates/provision/yealink/cp960/{$mac}.cfg
index b2f5cba8c1..647167e2fa 100644
--- a/resources/templates/provision/yealink/cp960/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp960/{$mac}.cfg
@@ -668,7 +668,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1183,7 +1183,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1682,7 +1682,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2179,7 +2179,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2675,7 +2675,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t19p/{$mac}.cfg b/resources/templates/provision/yealink/t19p/{$mac}.cfg
index b98e90ced6..905ab5c9b5 100644
--- a/resources/templates/provision/yealink/t19p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t19p/{$mac}.cfg
@@ -430,7 +430,7 @@ account.2.backup_outbound_host =
account.2.backup_outbound_port =
#Configure the voice mail number of account 2.
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#Configure the proxy server to account 2.
account.2.proxy_require =
diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg
index 0ebbb1d451..0466994bb7 100644
--- a/resources/templates/provision/yealink/t20p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg
@@ -432,7 +432,7 @@ account.2.backup_outbound_host =
account.2.backup_outbound_port =
#Configure the voice mail number of account 2.
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#Configure the proxy server to account 2.
account.2.proxy_require =
diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg
index 0dc54939fb..608cc9f8f3 100644
--- a/resources/templates/provision/yealink/t21p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg
@@ -666,7 +666,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1179,7 +1179,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1675,7 +1675,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2171,7 +2171,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2666,7 +2666,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index b98e90ced6..905ab5c9b5 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -430,7 +430,7 @@ account.2.backup_outbound_host =
account.2.backup_outbound_port =
#Configure the voice mail number of account 2.
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#Configure the proxy server to account 2.
account.2.proxy_require =
diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg
index 0831a350df..369973202a 100644
--- a/resources/templates/provision/yealink/t23g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg
@@ -682,7 +682,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1168,7 +1168,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1644,7 +1644,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2120,7 +2120,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2595,7 +2595,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg
index 66191de1ac..06306b7075 100644
--- a/resources/templates/provision/yealink/t23p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg
@@ -668,7 +668,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1154,7 +1154,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1630,7 +1630,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2106,7 +2106,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2581,7 +2581,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg
index fd23f97426..eba8c16256 100644
--- a/resources/templates/provision/yealink/t26p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg
@@ -430,7 +430,7 @@ account.2.backup_outbound_host =
account.2.backup_outbound_port =
#Configure the voice mail number of account 2.
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#Configure the proxy server to account 2.
account.2.proxy_require =
diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg
index f816877a78..2b50a7959c 100644
--- a/resources/templates/provision/yealink/t27g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg
@@ -681,7 +681,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1166,7 +1166,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1641,7 +1641,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2116,7 +2116,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2590,7 +2590,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg
index b28bbb439f..fea4d0e100 100644
--- a/resources/templates/provision/yealink/t27p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg
@@ -681,7 +681,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1166,7 +1166,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1641,7 +1641,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2116,7 +2116,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2590,7 +2590,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index fd23f97426..eba8c16256 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -430,7 +430,7 @@ account.2.backup_outbound_host =
account.2.backup_outbound_port =
#Configure the voice mail number of account 2.
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#Configure the proxy server to account 2.
account.2.proxy_require =
diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg
index da1122289b..64966a6ac2 100644
--- a/resources/templates/provision/yealink/t29g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg
@@ -682,7 +682,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1168,7 +1168,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1644,7 +1644,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2120,7 +2120,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2595,7 +2595,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t31g/{$mac}.cfg b/resources/templates/provision/yealink/t31g/{$mac}.cfg
index 94f2815d83..0c7ea66439 100644
--- a/resources/templates/provision/yealink/t31g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t31g/{$mac}.cfg
@@ -417,7 +417,7 @@ account.2.backup_outbound_host =
account.2.backup_outbound_port =
#Configure the voice mail number of account 2.
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#Configure the proxy server to account 2.
account.2.proxy_require =
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index b211adf22c..35635f9ce1 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -417,7 +417,7 @@ account.2.backup_outbound_host =
account.2.backup_outbound_port =
#Configure the voice mail number of account 2.
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#Configure the proxy server to account 2.
account.2.proxy_require =
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index b211adf22c..35635f9ce1 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -417,7 +417,7 @@ account.2.backup_outbound_host =
account.2.backup_outbound_port =
#Configure the voice mail number of account 2.
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#Configure the proxy server to account 2.
account.2.proxy_require =
diff --git a/resources/templates/provision/yealink/t40g/{$mac}.cfg b/resources/templates/provision/yealink/t40g/{$mac}.cfg
index 4dd43f9a6f..3f3d93eb3a 100644
--- a/resources/templates/provision/yealink/t40g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40g/{$mac}.cfg
@@ -682,7 +682,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1198,7 +1198,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1697,7 +1697,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2196,7 +2196,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2694,7 +2694,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg
index a3f17d3516..60745e6078 100644
--- a/resources/templates/provision/yealink/t40p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg
@@ -666,7 +666,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1179,7 +1179,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1675,7 +1675,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2171,7 +2171,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2666,7 +2666,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg
index 40ad80fe3e..bddef033a8 100644
--- a/resources/templates/provision/yealink/t41p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg
@@ -665,7 +665,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1178,7 +1178,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1674,7 +1674,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2170,7 +2170,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2665,7 +2665,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index a02c16dfc4..a5179af6f8 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -682,7 +682,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1168,7 +1168,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1644,7 +1644,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2120,7 +2120,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2595,7 +2595,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t42s/{$mac}.cfg b/resources/templates/provision/yealink/t42s/{$mac}.cfg
index 068ce11f43..4ef5a661a7 100644
--- a/resources/templates/provision/yealink/t42s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42s/{$mac}.cfg
@@ -681,7 +681,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1168,7 +1168,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1644,7 +1644,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2115,7 +2115,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2585,7 +2585,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index ec23e8dea1..4e5283bd6a 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -683,7 +683,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1169,7 +1169,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1645,7 +1645,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2121,7 +2121,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2596,7 +2596,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg
index 5809110892..dc517bb7d8 100644
--- a/resources/templates/provision/yealink/t46s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg
@@ -681,7 +681,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1171,7 +1171,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1652,7 +1652,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2128,7 +2128,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2603,7 +2603,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index 0c1386190a..c91eee6f29 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -682,7 +682,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1168,7 +1168,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1644,7 +1644,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2120,7 +2120,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2595,7 +2595,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg
index 69b95c2eb8..1c9a5fc118 100644
--- a/resources/templates/provision/yealink/t48s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg
@@ -681,7 +681,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1167,7 +1167,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1644,7 +1644,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2116,7 +2116,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2587,7 +2587,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg
index b82007dae9..26c3ff1eba 100644
--- a/resources/templates/provision/yealink/t49g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg
@@ -682,7 +682,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1207,7 +1207,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1706,7 +1706,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2205,7 +2205,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2703,7 +2703,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/t56a/{$mac}.cfg b/resources/templates/provision/yealink/t56a/{$mac}.cfg
index a9fb33366c..c342e97f85 100644
--- a/resources/templates/provision/yealink/t56a/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t56a/{$mac}.cfg
@@ -173,7 +173,7 @@ account.1.display_mwi.enable=
##The default value is blank.
account.1.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.1.blf_list_code =
@@ -635,7 +635,7 @@ account.2.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.2.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.2.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -1098,7 +1098,7 @@ account.3.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.3.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.3.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -1559,7 +1559,7 @@ account.4.display_mwi.enable=
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.4.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.4.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -2027,7 +2027,7 @@ account.5.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.5.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.5.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -2499,7 +2499,7 @@ account.6.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.6.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.6.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
diff --git a/resources/templates/provision/yealink/t58a/{$mac}.cfg b/resources/templates/provision/yealink/t58a/{$mac}.cfg
index a9fb33366c..c342e97f85 100644
--- a/resources/templates/provision/yealink/t58a/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58a/{$mac}.cfg
@@ -173,7 +173,7 @@ account.1.display_mwi.enable=
##The default value is blank.
account.1.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.1.blf_list_code =
@@ -635,7 +635,7 @@ account.2.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.2.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.2.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -1098,7 +1098,7 @@ account.3.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.3.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.3.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -1559,7 +1559,7 @@ account.4.display_mwi.enable=
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.4.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.4.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -2027,7 +2027,7 @@ account.5.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.5.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.5.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -2499,7 +2499,7 @@ account.6.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.6.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.6.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index 58b37007b3..2856d5de61 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -173,7 +173,7 @@ account.1.display_mwi.enable=
##The default value is blank.
account.1.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.1.blf_list_code =
@@ -635,7 +635,7 @@ account.2.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.2.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.2.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -1098,7 +1098,7 @@ account.3.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.3.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.3.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -1559,7 +1559,7 @@ account.4.display_mwi.enable=
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.4.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.4.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -2027,7 +2027,7 @@ account.5.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.5.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.5.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
@@ -2499,7 +2499,7 @@ account.6.mwi_parse_terminated =
##It configures the BLF List URI to monitor a list of users for account X.
##The default value is blank.
account.6.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.6.blf_list_code =
##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index b88234afba..f50561e69b 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -656,7 +656,7 @@ account.2.advanced.timer_t1 = 0.5
account.2.advanced.timer_t2 = 4
account.2.advanced.timer_t4 = 5
-voice_mail.number.2 = *97
+voice_mail.number.2 = {$voicemail_number}
#######################################################################################
@@ -1165,7 +1165,7 @@ account.3.advanced.timer_t1 = 0.5
account.3.advanced.timer_t2 = 4
account.3.advanced.timer_t4 = 5
-voice_mail.number.3 = *97
+voice_mail.number.3 = {$voicemail_number}
#######################################################################################
@@ -1657,7 +1657,7 @@ account.4.advanced.timer_t1 = 0.5
account.4.advanced.timer_t2 = 4
account.4.advanced.timer_t4 = 5
-voice_mail.number.4 = *97
+voice_mail.number.4 = {$voicemail_number}
#######################################################################################
@@ -2149,7 +2149,7 @@ account.5.advanced.timer_t1 = 0.5
account.5.advanced.timer_t2 = 4
account.5.advanced.timer_t4 = 5
-voice_mail.number.5 = *97
+voice_mail.number.5 = {$voicemail_number}
#######################################################################################
@@ -2640,7 +2640,7 @@ account.6.advanced.timer_t1 = 0.5
account.6.advanced.timer_t2 = 4
account.6.advanced.timer_t4 = 5
-voice_mail.number.6 = *97
+voice_mail.number.6 = {$voicemail_number}
#######################################################################################
diff --git a/resources/templates/provision/yealink/vp59/{$mac}.cfg b/resources/templates/provision/yealink/vp59/{$mac}.cfg
index e32c8f80c5..e1c245547f 100644
--- a/resources/templates/provision/yealink/vp59/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp59/{$mac}.cfg
@@ -187,7 +187,7 @@ account.{$row.line_number}.reason_code_name.1 =
##The default value is blank.
account.{$row.line_number}.blf.blf_list_uri =
-##It configures the feature access code for directed call pickup (default: *97) for account X.
+##It configures the feature access code for directed call pickup (default: {$voicemail_number}) for account X.
##The default value is blank.
account.{$row.line_number}.blf_list_code =
diff --git a/resources/templates/provision/zoiper/5.x/config.xml b/resources/templates/provision/zoiper/5.x/config.xml
index 72694b17e0..1e19ebff30 100644
--- a/resources/templates/provision/zoiper/5.x/config.xml
+++ b/resources/templates/provision/zoiper/5.x/config.xml
@@ -227,7 +227,7 @@
{$account.1.user_password}
true
false
- *97
+ {$voicemail_number}
*99
false
false