diff --git a/resources/templates/provision/fanvil/x5s/{$mac}.cfg b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
index a614eaab39..7e81908ccd 100644
--- a/resources/templates/provision/fanvil/x5s/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5s/{$mac}.cfg
@@ -81,11 +81,7 @@
             <RegisterPswd>{$user_password_1}</RegisterPswd>
             <RegisterTTL>{$register_expires_1}</RegisterTTL>
             
-            {if isset($user_password_1) }
-            <EnableReg>1</EnableReg>
-            {else}
-            <EnableReg>0</EnableReg>
-            {/if}
+            <EnableReg>{if isset($user_password_1)}1{else}0{/if}</EnableReg>
 
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
@@ -225,11 +221,7 @@
             <RegisterPswd>{$user_password_2}</RegisterPswd>
             <RegisterTTL>{$register_expires_2}</RegisterTTL>
             
-            {if isset($user_password_2) }
-            <EnableReg>1</EnableReg>
-            {else}
-            <EnableReg>0</EnableReg>
-            {/if}
+            <EnableReg>{if isset($user_password_2)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
@@ -369,11 +361,7 @@
             <RegisterPswd>{$user_password_3}</RegisterPswd>
             <RegisterTTL>{$register_expires_3}</RegisterTTL>
             
-            {if isset($user_password_3) }
-            <EnableReg>1</EnableReg>
-            {else}
-            <EnableReg>0</EnableReg>
-            {/if}
+            <EnableReg>{if isset($user_password_3)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
@@ -513,11 +501,7 @@
             <RegisterPswd>{$user_password_4}</RegisterPswd>
             <RegisterTTL>{$register_expires_1}</RegisterTTL>
             
-            {if isset($user_password_4) }
-            <EnableReg>1</EnableReg>
-            {else}
-            <EnableReg>0</EnableReg>
-            {/if}
+            <EnableReg>{if isset($user_password_4)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
@@ -657,11 +641,7 @@
             <RegisterPswd>{$user_password_5}</RegisterPswd>
             <RegisterTTL>{$register_expires_5}</RegisterTTL>
             
-            {if isset($user_password_5) }
-            <EnableReg>1</EnableReg>
-            {else}
-            <EnableReg>0</EnableReg>
-            {/if}
+            <EnableReg>{if isset($user_password_5)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
@@ -801,11 +781,7 @@
             <RegisterPswd>{$user_password_6}</RegisterPswd>
             <RegisterTTL>{$register_expires_6}</RegisterTTL>
             
-            {if isset($user_password_6) }
-            <EnableReg>1</EnableReg>
-            {else}
-            <EnableReg>0</EnableReg>
-            {/if}
+            <EnableReg>{if isset($user_password_6)}1{else}0{/if}</EnableReg>
             
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
@@ -1129,7 +1105,7 @@
         </date>
         <timeDisplay>
             <EnableTimeDisplay>0</EnableTimeDisplay>
-            <TimeDisplayStyle>0</TimeDisplayStyle>
+            <TimeDisplayStyle>{if isset($fanvil_time_display)}1{else}0{/if}</TimeDisplayStyle>
             <DateDisplayStyle>0</DateDisplayStyle>
             <DateSeparator>0</DateSeparator>
         </timeDisplay>