diff --git a/resources/templates/provision/cisco/8861/{$mac}.xml b/resources/templates/provision/cisco/8861/{$mac}.xml
index 421d6b0851..36ccd02ef6 100644
--- a/resources/templates/provision/cisco/8861/{$mac}.xml
+++ b/resources/templates/provision/cisco/8861/{$mac}.xml
@@ -9,8 +9,8 @@
3600
80
Yes
-
-
+{$admin_password}
+{$user_password}
No
No
@@ -35,8 +35,9 @@
Yes
NOTICE
-
-
+
+{$ntp_server_primary}
+{$ntp_server_secondary}
No
No
@@ -124,9 +125,9 @@
telephone-event
No
-No
+{$spa_handle_via_rport}
No
-No
+{$spa_insert_via_rport}
No
No
No
@@ -150,10 +151,16 @@
Yes
-/$PSN.xml
-
-
-
+
+{if isset ($http_auth_username)}
+[--uid {$http_auth_username} --pwd {$http_auth_password}]http://{$domain_name}{$project_path}/app/provision/?mac=$MA
+{else}
+http://{$domain_name}{$project_path}/app/provision/?mac=$MA
+{/if}
+
+
+
+
66,160,159,150,60,43,125
$PN $MAC -- Requesting resync $SCHEME://$SERVIP:$PORT$PATH
$PN $MAC -- Successful resync $SCHEME://$SERVIP:$PORT$PATH
@@ -278,72 +285,36 @@
-GMT-08:00
+{$spa_time_zone}
Yes
-start=3/-1/7/2;end=10/-1/7/2;save=1
+start={$daylight_savings_start_month}/{$daylight_savings_start_day}/{$daylight_savings_start_weekday}/{$daylight_savings_start_time}:0:0;end={$daylight_savings_stop_month}/{$daylight_savings_stop_day}/{$daylight_savings_stop_weekday}/{$daylight_savings_stop_time}:0:0;save=1
Yes
English-US
en-US
-
-
-
+{$device_label}
+{$display_name_1}
+*97
Phone
5
-1
-$USER
-private
-
-
-2
-$USER
-private
-
-
-3
-$USER
-private
-
-
-4
-$USER
-private
-
-
-5
-$USER
-private
-
-
-6
-$USER
-private
-
-
-7
-$USER
-private
-
-
-8
-$USER
-private
-
-
-9
-$USER
-private
-
-
-10
-$USER
-private
-
+
+{foreach $keys["line"] as $row}
+{if $row.device_key_category == "line"}
+
+{$row.device_key_line}
+{$row.device_key_label}
+{if $row.device_key_type == "shared"}shared{else}private{/if}
+{$row.device_key_value}
+
+{/if}
+{/foreach}
+
+
Horizontal First
No
@@ -455,9 +426,9 @@
Yes
-No
+{if $shared_line_1 == "shared"}shared{else}private{/if}
-3600
+600
No
No
@@ -468,8 +439,8 @@
0x68
0xb8
-UDP
-5060
+{$account.1.sip_transport|upper}
+{$account.1.sip_port}
No
0
Yes
@@ -498,30 +469,31 @@
86400
No
Yes
-No
+{$spa_feature_key_sync}
No
No
3600
-
-
+{$domain_name}
+{$account.1.outbound_proxy_primary}
Yes
Yes
No
-3600
+{$account.1.register_expires}
No
-No
-Yes
-3600
+{if $account.1.sip_transport == 'dns srv'}Yes{/if}
+{if $account.1.sip_transport != 'dns srv'}No{/if}
+No
+600
Normal
No
No
-
-
-
+{$account.1.display_name}
+{$account.1.user_id}
+{$account.1.password}
@@ -541,15 +513,15 @@
Default
AES 128
-(*xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)
+{$spa_dial_plan}
No
Yes
-No
-
+{if $account.2.shared_line == "shared"}shared{else}private{/if}
+
3600
No
@@ -561,8 +533,8 @@
0x68
0xb8
-UDP
-5061
+{$account.2.sip_transport|upper}
+{$account.2.sip_port}
No
0
Yes
@@ -596,25 +568,26 @@
No
3600
-
-
+{$domain_name}
+{$account.2.outbound_proxy_primary}
Yes
Yes
No
-3600
+{$account.2.register_expires}
No
-No
-Yes
-3600
+{if $account.2.sip_transport == 'dns srv'}Yes{/if}
+{if $account.2.sip_transport != 'dns srv'}No{/if}
+No
+600
Normal
No
No
-
-
-
+{$account.2.display_name}
+{$account.2.user_id}
+{$account.2.password}
@@ -634,16 +607,16 @@
Default
AES 128
-(*xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)
+{$spa_dial_plan}
No
Yes
-No
+{if $account.3.shared_line == "shared"}shared{else}private{/if}
-3600
+600
No
No
@@ -654,8 +627,8 @@
0x68
0xb8
-UDP
-5062
+{$account.3.sip_transport|upper}
+{$account.3.sip_port}
No
0
Yes
@@ -684,30 +657,31 @@
86400
No
Yes
-No
+{$spa_feature_key_sync}
No
No
3600
-
-
+{$domain_name}
+{$account.3.outbound_proxy_primary}
Yes
Yes
No
-3600
+{$account.3.register_expires}
No
-No
-Yes
-3600
+{if $account.3.sip_transport == 'dns srv'}Yes{/if}
+{if $account.3.sip_transport != 'dns srv'}No{/if}
+No
+600
Normal
No
No
-
-
-
+{$account.3.display_name}
+{$account.3.user_id}
+{$account.3.password}
@@ -727,16 +701,16 @@
Default
AES 128
-(*xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)
+{$spa_dial_plan}
No
Yes
-No
+{if $account.4.shared_line == "shared"}shared{else}private{/if}
-3600
+600
No
No
@@ -747,8 +721,8 @@
0x68
0xb8
-UDP
-5063
+{$account.4.sip_transport|upper}
+{$account.4.sip_port}
No
0
Yes
@@ -777,30 +751,32 @@
86400
No
Yes
-No
+{$spa_feature_key_sync}
No
No
3600
-
-
+{$domain_name}
+{$account.4.outbound_proxy_primary}
Yes
Yes
No
-3600
+{$account.4.register_expires}
No
-No
+{if $account.4.sip_transport == 'dns srv'}Yes{/if}
+{if $account.4.sip_transport != 'dns srv'}No{/if}
Yes
-3600
+600
Normal
No
No
-
-
-
+{$account.4.display_name}
+{$account.4.user_id}
+{$account.4.password}
+
@@ -820,16 +796,16 @@
Default
AES 128
-(*xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)
+{$spa_dial_plan}
No
Yes
-No
+{if $account.5.shared_line == "shared"}shared{else}private{/if}
-3600
+600
No
No
@@ -840,8 +816,8 @@
0x68
0xb8
-UDP
-5064
+{$account.5.sip_transport|upper}
+{$account.5.sip_port}
No
0
Yes
@@ -870,30 +846,31 @@
86400
No
Yes
-No
+{$spa_feature_key_sync}
No
No
3600
-
-
+{$domain_name}
+{$account.5.outbound_proxy_primary}
Yes
Yes
No
-3600
+{$account.5.register_expires}
No
-No
+{if $account.5.sip_transport == 'dns srv'}Yes{/if}
+{if $account.5.sip_transport != 'dns srv'}No{/if}
Yes
-3600
+600
Normal
No
-No
+Yes
-
-
-
+{$account.5.display_name}
+{$account.5.user_id}
+{$account.5.user_password}
@@ -913,7 +890,7 @@
Default
AES 128
-(*xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)
+{$spa_dial_plan}
No
@@ -1468,116 +1445,20 @@
No
Name
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+{foreach $keys["expansion"] as $row}
+{$row.device_key_value}
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+{$row.device_key_value}
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+{$row.device_key_value}
+{/foreach}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
No