diff --git a/app/fanvil/app_config.php b/app/fanvil/app_config.php
index 4fb7d560e6..4815b2a277 100644
--- a/app/fanvil/app_config.php
+++ b/app/fanvil/app_config.php
@@ -294,13 +294,45 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Dial call as audio only or audio with video. 1-Audio, 2-Video Note: If you set this to video, then video is offered in the first invite which can cause your call to hang or not complete if going through a sip trunk provider.";
 		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9a878f97-31bf-4d1a-93e2-c3b51c962383";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_network_failure_reboot";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "If network fails, automatically reboot. 0 - NO, 1 - Yes";
+		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2b14337d-8c2b-4f17-8d43-cf0341db6b8c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_network_failure_wait_time";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "300";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Time to wait before automatic reboot in seconds.";
+		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "71fcfa1c-2921-43ed-aadb-9cd335cba6fb";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_sip_failure_reboot";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "If sip registration fails, automatically reboot. 0 - NO, 1 - Yes";
+		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "793c48b1-092b-44db-ac37-14339744a985";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_sip_failure_wait_time";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "180";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Time to wait before automatic reboot in seconds.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "37ddabf0-8d7c-494f-b381-5bc4e3048bff";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_enable_auto_upgrade";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable firmware auto upgrade 0 - NO, 1 - Yes";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable firmware auto upgrade. 0 - NO, 1 - Yes";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5a2a79c3-befb-4b7a-998d-3f0bfc9fcde4";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
@@ -398,6 +430,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X6 firmware ROM";
 		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c6842526-ca39-47f1-85af-1c4448b2fbd4";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_switch_open_duration";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Time to hold switch in open position in seconds. ";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4b7f56f3-31a9-46dd-b588-35b253024b1f";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_switch_mode";
@@ -414,6 +454,22 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable RFID Card Reader. 0 - NO, 1 - Yes";
 		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e8480f45-b359-4ad3-9c6f-8d7f471c3057";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_digit_pad";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable numeric digit pad. 0 - NO, 1 - Yes";
+		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e8480f45-b359-4ad3-9c6f-8d7f471c3057";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_function_key_answer";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Allow function key to answer call made to the door. 0 - NO, 1 - Yes";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7226d18c-7d49-449b-be7b-8cfb46c1ddb3";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_indoor_open";
@@ -446,7 +502,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default: 6789";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0c5fe247-0361-4c69-a247-d14b5417e53e";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "717573af-0247-41c1-9566-79fe38bef630";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_syslog";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
diff --git a/resources/templates/provision/fanvil/i30/{$mac}.cfg b/resources/templates/provision/fanvil/i30/{$mac}.cfg
index dbde1e419f..deb992ea2a 100644
--- a/resources/templates/provision/fanvil/i30/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/i30/{$mac}.cfg
@@ -6,8 +6,8 @@
 <WAN_IP></WAN_IP>
 <WAN_Subnet_Mask>255.255.255.0</WAN_Subnet_Mask>
 <WAN_Gateway></WAN_Gateway>
-<Primary_DNS>{$dns_server_primary}</Primary_DNS>
-<Secondary_DNS>{$dns_server_secondary}</Secondary_DNS>
+<Primary_DNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}</Primary_DNS>
+<Secondary_DNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}202.96.134.133{/if}</Secondary_DNS>
 <Enable_DHCP>1</Enable_DHCP>
 <Use_Vendor_Class_ID>0</Use_Vendor_Class_ID>
 <Vendor_Class_ID>Fanvil i30</Vendor_Class_ID>
@@ -17,7 +17,7 @@
 <Domain_Name></Domain_Name>
 <Host_Name>VOIP</Host_Name>
 <Enable_PPPoE>0</Enable_PPPoE>
-<RTP_Initial_Port>10000</RTP_Initial_Port>
+<RTP_Initial_Port>16384</RTP_Initial_Port>
 <RTP_Port_Quantity>200</RTP_Port_Quantity>
 <SNTP_Server>{$ntp_server_primary}</SNTP_Server>
 <Second_SNTP_Server>{$ntp_server_secondary}</Second_SNTP_Server>
@@ -26,9 +26,9 @@
 <Location>{$fanvil_location}</Location>
 <Time_Zone_Name>{$fanvil_time_zone_name}</Time_Zone_Name>
 <Enable_DST>{$fanvil_enable_dst}</Enable_DST>
-<DST_Fixed_Type>{$fanvil_DST_fixed_type}</DST_Fixed_Type>
+<DST_Fixed_Type>{$fanvil_dst_fixed_type}</DST_Fixed_Type>
 <SNTP_Timeout>60</SNTP_Timeout>
-<DST_Min_Offset>{if isset($fanvil_DST_Minute_offset)}{$fanvil_DST_Minute_offset}{else}60{/if}</DST_Min_Offset>
+<DST_Min_Offset>{if isset($fanvil_dst_minute_offset)}{$fanvil_dst_minute_offset}{else}60{/if}</DST_Min_Offset>
 <DST_Start_Mon>3</DST_Start_Mon>
 <DST_Start_Week>5</DST_Start_Week>
 <DST_Start_Wday>0</DST_Start_Wday>
@@ -82,10 +82,10 @@
 <Reboot_Fixed_Time>2</Reboot_Fixed_Time>
 <Reboot_Already>0</Reboot_Already>
 <Reboot_Uptime>72</Reboot_Uptime>
-<Net_Fail_Reboot>0</Net_Fail_Reboot>
-<Net_Fail_Wait_Time>300</Net_Fail_Wait_Time>
-<Sip_Fail_Reboot>0</Sip_Fail_Reboot>
-<Sip_Fail_Wait_Time>180</Sip_Fail_Wait_Time>
+<Net_Fail_Reboot>{$fanvil_network_failure_reboot}</Net_Fail_Reboot>
+<Net_Fail_Wait_Time>{$fanvil_network_failure_wait_time}</Net_Fail_Wait_Time>
+<Sip_Fail_Reboot>{$fanvil_sip_failure_reboot}</Sip_Fail_Reboot>
+<Sip_Fail_Wait_Time>{$fanvil_sip_failure_wait_time}</Sip_Fail_Wait_Time>
 </GLOBAL_CONFIG_MODULE>
 <LAN_CONFIG_MODULE>
 <LAN_IP>10.10.99.49</LAN_IP>
@@ -560,7 +560,7 @@
 <EGS_CFG_MODULE>
 <Enable_Touchpad>0</Enable_Touchpad>
 <Enable_Card_Reader>{if isset($fanvil_egs_enable_card_reader)}{$fanvil_egs_enable_card_reader}{else}1{/if}</Enable_Card_Reader>
-<Opening_Duration>5</Opening_Duration>
+<Opening_Duration>{if isset($fanvil_egs_switch_open_duration)}{$fanvil_egs_switch_open_duration}{else}1{/if}</Opening_Duration>
 <SecOpening_Duration>5</SecOpening_Duration>
 <Talking_Duration>120</Talking_Duration>
 <Keypad_Dial_Mode>0</Keypad_Dial_Mode>
@@ -576,13 +576,13 @@
 <Day_Start_Time>360</Day_Start_Time>
 <Day_End_Time>1080</Day_End_Time>
 <Enable_Log>{if isset($fanvil_egs_enable_syslog)}{$fanvil_egs_enable_syslog}{else}0{/if}</Enable_Log>
-<Port_of_Log_Server>{if isset($fanvil_egs_log_port)}{$fanvil_egs_log_port}{else}0.0.0.0{/if}</Port_of_Log_Server>
-<Addr._of_Log_Server>{if isset($fanvil_egs_log_server)}{$fanvil_egs_log_server}{else}514{/if}</Addr._of_Log_Server>
+<Port_of_Log_Server>{if isset($fanvil_egs_log_port)}{$fanvil_egs_log_port}{else}514{/if}</Port_of_Log_Server>
+<Addr._of_Log_Server>{if isset($fanvil_egs_log_server)}{$fanvil_egs_log_server}{else}0.0.0.0{/if}</Addr._of_Log_Server>
 <Enable_Indoor_Open>{if isset($fanvil_egs_enable_indoor_open)}{$fanvil_egs_enable_indoor_open}{else}1{/if}</Enable_Indoor_Open>
 <Auto_Handdown>1</Auto_Handdown>
-<Enable_Digitpad>1</Enable_Digitpad>
+<Enable_Digitpad>{$fanvil_egs_enable_digit_pad}</Enable_Digitpad>
 <Enable_Dual_Auth>0</Enable_Dual_Auth>
-<Enable_FuncKey_Ans>1</Enable_FuncKey_Ans>
+<Enable_FuncKey_Ans>{$fanvil_egs_enable_function_key_answer}</Enable_FuncKey_Ans>
 <Switch_Mode>{if isset($fanvil_egs_switch_mode)}{$fanvil_egs_switch_mode}{else}0{/if}</Switch_Mode>
 <SecSwitch_Mode>0</SecSwitch_Mode>
 <Fixed_Code_Length>4</Fixed_Code_Length>
@@ -759,7 +759,7 @@
 </PPPoE_CONFIG_MODULE>
 <MMI_CONFIG_MODULE>
 <Web_Port>80</Web_Port>
-<Web_Server_Type>1</Web_Server_Type>
+<Web_Server_Type>0</Web_Server_Type>
 <Https_Web_Port>443</Https_Web_Port>
 </MMI_CONFIG_MODULE>
 <QOS_CONFIG_MODULE>
@@ -801,70 +801,20 @@
 <Enable_Default_Line>0</Enable_Default_Line>
 <Enable_Auto_SelLine>1</Enable_Auto_SelLine>
 <Function_Key>
+{foreach $keys["memory"] as $row}
+{if $row.device_key_id <= 1}
 <Function_Key_Entry>
-<ID>Fkey1</ID>
+<ID>Fkey{$row.device_key_id}</ID>
 <Type>1</Type>
-<Value>3030@1/f</Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey2</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey3</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey4</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey5</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey6</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey7</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey8</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey9</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
-</Function_Key_Entry>
-<Function_Key_Entry>
-<ID>Fkey10</ID>
-<Type>0</Type>
-<Value></Value>
-<Title></Title>
+<Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+<Title>{$row.device_key_label}</Title>
 </Function_Key_Entry>
+{/if}
+{/foreach}
 </Function_Key>
 </PHONE_CONFIG_MODULE>
 <AUTOUPDATE_CONFIG_MODULE>
-<Auto_Image_Url>http://{$domain_name}/app/provision/{$fanvil_firmware_i30}</Auto_Image_Url>
+<Auto_Image_Url>http://{$domain_name}/app/fanvil/resources/firmware/{$fanvil_firmware_i30}</Auto_Image_Url>
 <Download_Username></Download_Username>
 <Download_Password></Download_Password>
 <FDPS_Enable>1</FDPS_Enable>
@@ -914,7 +864,7 @@
 <ACS_BackupPassword>admin</ACS_BackupPassword>
 <CPE_UserName>dps</CPE_UserName>
 <CPE_Password>dps</CPE_Password>
-<CPE_SerialNumber>00100400FV02001000000c383e1e6331</CPE_SerialNumber>
+<CPE_SerialNumber></CPE_SerialNumber>
 <ProvisioningCode></ProvisioningCode>
 <Download_Start_Time>0</Download_Start_Time>
 <Download_End_Time>0</Download_End_Time>
@@ -987,12 +937,15 @@
 <IPC_M_Stream_Number>1</IPC_M_Stream_Number>
 <IPC_S_Stream_Number>1</IPC_S_Stream_Number>
 <Name>ipCameraName</Name>
-<Username></Username>
-<Password></Password>
+<Username>{if isset($admin_name)}{$admin_name}{else}admin{/if}</Username>
+<Password>{if isset($admin_password)}{$admin_password}{else}admin{/if}</Password>
 <Camera_Brand>1</Camera_Brand>
 <Server_Ip></Server_Ip>
 <Server_Port>554</Server_Port>
 <Main_Rtsp_Url></Main_Rtsp_Url>
 <Sub_Rtsp_Url></Sub_Rtsp_Url>
+<OSD_Time_Enable>0</OSD_Time_Enable>
+<OSD_Title_Enable>1</OSD_Title_Enable>
+<OSD_Title_Content>Front Door</OSD_Title_Content>
 </IPC_CONFIG_MODULE>
 </VOIP_CONFIG_FILE>