diff --git a/resources/templates/provision/panasonic/tgp550/{$mac}.cfg b/resources/templates/provision/panasonic/tgp550/{$mac}.cfg
index 3d6d7a0324..5324755154 100644
--- a/resources/templates/provision/panasonic/tgp550/{$mac}.cfg
+++ b/resources/templates/provision/panasonic/tgp550/{$mac}.cfg
@@ -231,18 +231,18 @@ PRIVACY_MODE_1="Y"
 ## SIP Settings
 SIP_USER_AGENT="Panasonic_{literal}{MODEL}/{fwver} ({mac}){/literal}"
 
-SIP_AUTHID_1="{$user_id_1}"
+SIP_AUTHID_1="{$account.1.auth_id}"
 
-SIP_PASS_1="{$user_password_1}"
+SIP_PASS_1="{$account.1.password}"
 SIP_SRC_PORT_1="5060"
 
-SIP_PRXY_ADDR_1="{$server_address_1}"
+SIP_PRXY_ADDR_1="{$account.1.server_address}"
 SIP_PRXY_PORT_1="5060"
 
-SIP_RGSTR_ADDR_1="{$server_address_1}"
+SIP_RGSTR_ADDR_1="{$account.1.server_address}"
 SIP_RGSTR_PORT_1="5060"
 
-SIP_SVCDOMAIN_1="{$server_address_1}"
+SIP_SVCDOMAIN_1="{$account.1.server_address}"
 REG_EXPIRE_TIME_1="3600"
 REG_INTERVAL_RATE_1="90"
 SIP_SESSION_TIME_1="0"
@@ -263,7 +263,7 @@ SIP_TCP_SRV_PREFIX_1="_sip._tcp."
 SIP_100REL_ENABLE_1="N"
 SIP_18X_RTX_INTVL_1="0"
 
-SIP_PRSNC_ADDR_1="{$server_address_1}"
+SIP_PRSNC_ADDR_1="{$account.1.server_address}"
 SIP_PRSNC_PORT_1="5060"
 SIP_2NDPRSNC_ADDR_1=""
 SIP_2NDPRSNC_PORT_1="5060"
@@ -296,7 +296,7 @@ PHONE_NUMBER_1="{$user_id_1}"
 
 LINE_ID_1="{$user_id_1}"
 
-DISPLAY_NAME_1="{$display_name_1}"
+DISPLAY_NAME_1="{$account.1.display_name}"
 INTERNATIONAL_ACCESS_CODE=""
 
 #----------------------------------------------------------#
@@ -368,18 +368,18 @@ PRIVACY_MODE_2="Y"
 
 ## SIP Settings
 
-SIP_AUTHID_2="{$user_id_2}"
+SIP_AUTHID_2="{$account.2.auth_id}"
 
-SIP_PASS_2="{$user_password_2}"
+SIP_PASS_2="{$account.2.password}"
 SIP_SRC_PORT_2="5070"
 
-SIP_PRXY_ADDR_2="{$server_address_2}"
+SIP_PRXY_ADDR_2="{$account.2.server_address}"
 SIP_PRXY_PORT_2="5060"
 
-SIP_RGSTR_ADDR_2="{$server_address_2}"
+SIP_RGSTR_ADDR_2="{$account.2.server_address}"
 SIP_RGSTR_PORT_2="5060"
 
-SIP_SVCDOMAIN_2="{$server_address_2}"
+SIP_SVCDOMAIN_2="{$account.2.server_address}"
 REG_EXPIRE_TIME_2="3600"
 REG_INTERVAL_RATE_2="90"
 SIP_SESSION_TIME_2="0"
@@ -403,7 +403,7 @@ SIP_REQURI_PORT_2="Y"
 SIP_ADD_RPORT_2="N"
 SIP_SESSION_METHOD_2="0"
 
-SIP_PRSNC_ADDR_2="{$server_address_2}"
+SIP_PRSNC_ADDR_2="{$account.2.server_address}"
 SIP_PRSNC_PORT_2="5060"
 SIP_2NDPRSNC_ADDR_2=""
 SIP_2NDPRSNC_PORT_2="5060"
@@ -429,11 +429,11 @@ SIP_DETECT_SSAF_2="N"
 SIP_RCV_DET_HEADER_2="N"
 SIP_CONTACT_ON_ACK_2="N"
 
-PHONE_NUMBER_2="{$user_id_2}"
+PHONE_NUMBER_2="{$account.2.user_id}"
 
-LINE_ID_2="{$user_id_2}"
+LINE_ID_2="{$account.2.user_id}"
 
-DISPLAY_NAME_2="{$display_name_2}"
+DISPLAY_NAME_2="{$account.2.display_name}"
 
 #----------------------------------------------------------#
 # Settings for line 3 to 8 follows...                      #