diff --git a/app/fanvil/app_config.php b/app/fanvil/app_config.php
index 4815b2a277..f118204bed 100644
--- a/app/fanvil/app_config.php
+++ b/app/fanvil/app_config.php
@@ -98,9 +98,17 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_date_display";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "3";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "9";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "value 0-13 Date Format";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "value 0-13 Date Format. 9=YYYY MM DD (ISO8601)";
+		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a18c9b2a-a53b-4b9a-aa81-2bffa1771d0b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_date_separator";
+		$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'] = "0='/', 1='-', 2='.', 3=' '(space).";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d2eab7fd-0d20-4e71-ab91-7554243c9807";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 25d240fbf3..3fd2a22b25 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -1188,8 +1188,8 @@
         <timeDisplay>
             <EnableTimeDisplay>0</EnableTimeDisplay>
             <TimeDisplayStyle>{if isset($fanvil_time_display)}1{else}0{/if}</TimeDisplayStyle>
-            <DateDisplayStyle>6</DateDisplayStyle>
-            <DateSeparator>1</DateSeparator>
+            <DateDisplayStyle>{if isset($fanvil_date_display)}{$fanvil_date_display}{else}6{/if}</DateDisplayStyle>
+            <DateSeparator>{if isset($fanvil_date_separator)}{$fanvil_date_separator}{else}0{/if}</DateSeparator>
         </timeDisplay>
         <softkey>
             <DesktopSoftkey>history;contact;dnd;menu;</DesktopSoftkey>