diff --git a/resources/templates/provision/fanvil/x4g/{$mac}.cfg b/resources/templates/provision/fanvil/x4g/{$mac}.cfg
index 9f968e9d16..c6f1ee96f1 100644
--- a/resources/templates/provision/fanvil/x4g/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4g/{$mac}.cfg
@@ -274,15 +274,15 @@
 <Register_Addr>{$line.1.server_address}</Register_Addr>
 <Register_Port>{$line.1.sip_port}</Register_Port>
 <Register_User>{$line.1.auth_id}</Register_User>
-<Register_Pswd>{$line.1.user_password}</Register_Pswd>
+<Register_Pswd>{$line.1.password}</Register_Pswd>
 <Register_TTL>{$line.1.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($line.1.user_password)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($line.1.password)}1{else}0{/if}</Enable_Reg>
 
 <Proxy_Addr>{$line.1.outbound_proxy_primary}</Proxy_Addr>
 <Proxy_Port>{$line.1.sip_port}</Proxy_Port>
 <Proxy_User>{$line.1.auth_id}</Proxy_User>
-<Proxy_Pswd>{$line.1.user_password}</Proxy_Pswd>
+<Proxy_Pswd>{$line.1.password}</Proxy_Pswd>
 <BakProxy_Addr>{$line.1.outbound_proxy_secondary}</BakProxy_Addr>
 <BakProxy_Port>{$line.1.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
@@ -409,15 +409,15 @@
 <Register_Addr>{$line.2.server_address}</Register_Addr>
 <Register_Port>{$line.2.sip_port}</Register_Port>
 <Register_User>{$line.2.auth_id}</Register_User>
-<Register_Pswd>{$line.2.user_password}</Register_Pswd>
+<Register_Pswd>{$line.2.password}</Register_Pswd>
 <Register_TTL>{$line.2.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($line.2.user_password)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($line.2.password)}1{else}0{/if}</Enable_Reg>
 
 <Proxy_Addr>{$line.2.outbound_proxy_primary}</Proxy_Addr>
 <Proxy_Port>{$line.2.sip_port}</Proxy_Port>
 <Proxy_User>{$line.2.auth_id}</Proxy_User>
-<Proxy_Pswd>{$line.2.user_password}</Proxy_Pswd>
+<Proxy_Pswd>{$line.2.password}</Proxy_Pswd>
 <BakProxy_Addr>{$line.2.outbound_proxy_secondary}</BakProxy_Addr>
 <BakProxy_Port>{$line.2.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
@@ -544,15 +544,15 @@
 <Register_Addr>{$line.3.server_address}</Register_Addr>
 <Register_Port>{$line.3.sip_port}</Register_Port>
 <Register_User>{$line.3.auth_id}</Register_User>
-<Register_Pswd>{$line.3.user_password}</Register_Pswd>
+<Register_Pswd>{$line.3.password}</Register_Pswd>
 <Register_TTL>{$line.3.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($line.3.user_password)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($line.3.password)}1{else}0{/if}</Enable_Reg>
 
 <Proxy_Addr>{$line.3.outbound_proxy_primary}</Proxy_Addr>
 <Proxy_Port>{$line.3.sip_port}</Proxy_Port>
 <Proxy_User>{$line.3.auth_id}</Proxy_User>
-<Proxy_Pswd>{$line.3.user_password}</Proxy_Pswd>
+<Proxy_Pswd>{$line.3.password}</Proxy_Pswd>
 <BakProxy_Addr>{$line.3.outbound_proxy_secondary}</BakProxy_Addr>
 <BakProxy_Port>{$line.3.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>
@@ -679,15 +679,15 @@
 <Register_Addr>{$line.4.server_address}</Register_Addr>
 <Register_Port>{$line.4.sip_port}</Register_Port>
 <Register_User>{$line.4.auth_id}</Register_User>
-<Register_Pswd>{$line.4.user_password}</Register_Pswd>
+<Register_Pswd>{$line.4.password}</Register_Pswd>
 <Register_TTL>{$line.4.register_expires}</Register_TTL>
 
-<Enable_Reg>{if isset($line.4.user_password)}1{else}0{/if}</Enable_Reg>
+<Enable_Reg>{if isset($line.4.password)}1{else}0{/if}</Enable_Reg>
 
 <Proxy_Addr>{$line.4.outbound_proxy_primary}</Proxy_Addr>
 <Proxy_Port>{$line.4.sip_port}</Proxy_Port>
 <Proxy_User>{$line.4.auth_id}</Proxy_User>
-<Proxy_Pswd>{$line.4.user_password}</Proxy_Pswd>
+<Proxy_Pswd>{$line.4.password}</Proxy_Pswd>
 <BakProxy_Addr>{$line.4.outbound_proxy_secondary}</BakProxy_Addr>
 <BakProxy_Port>{$line.4.sip_port}</BakProxy_Port>
 <Enable_Failbac>1</Enable_Failbac>