diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index cec4b5bd6d..5f577a8ab4 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -88,7 +88,13 @@
             <RegisterUser>{$auth_id_1}</RegisterUser>
             <RegisterPswd>{$user_password_1}</RegisterPswd>
             <RegisterTTL>3600</RegisterTTL>
+            
+            {if isset($user_password_1) }
             <EnableReg>1</EnableReg>
+            {else}
+            <EnableReg>0</EnableReg>
+            {/if}
+
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
             <ProxyUser></ProxyUser>
@@ -222,7 +228,13 @@
             <RegisterUser>{$auth_id_2}</RegisterUser>
             <RegisterPswd>{$user_password_2}</RegisterPswd>
             <RegisterTTL>3600</RegisterTTL>
+            
+            {if isset($user_password_2) }
             <EnableReg>1</EnableReg>
+            {else}
+            <EnableReg>0</EnableReg>
+            {/if}
+            
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
             <ProxyUser></ProxyUser>
@@ -356,7 +368,13 @@
             <RegisterUser>{$auth_id_3}</RegisterUser>
             <RegisterPswd>{$user_password_3}</RegisterPswd>
             <RegisterTTL>3600</RegisterTTL>
+            
+            {if isset($user_password_3) }
             <EnableReg>1</EnableReg>
+            {else}
+            <EnableReg>0</EnableReg>
+            {/if}
+            
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
             <ProxyUser></ProxyUser>
@@ -490,7 +508,13 @@
             <RegisterUser>{$auth_id_4}</RegisterUser>
             <RegisterPswd>{$user_password_4}</RegisterPswd>
             <RegisterTTL>3600</RegisterTTL>
+            
+            {if isset($user_password_4) }
             <EnableReg>1</EnableReg>
+            {else}
+            <EnableReg>0</EnableReg>
+            {/if}
+            
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
             <ProxyUser></ProxyUser>
@@ -624,7 +648,13 @@
             <RegisterUser>{$auth_id_5}</RegisterUser>
             <RegisterPswd>{$user_password_5}</RegisterPswd>
             <RegisterTTL>3600</RegisterTTL>
+            
+            {if isset($user_password_5) }
             <EnableReg>1</EnableReg>
+            {else}
+            <EnableReg>0</EnableReg>
+            {/if}
+            
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
             <ProxyUser></ProxyUser>
@@ -758,7 +788,13 @@
             <RegisterUser>{$auth_id_6}</RegisterUser>
             <RegisterPswd>{$user_password_6}</RegisterPswd>
             <RegisterTTL>3600</RegisterTTL>
+            
+            {if isset($user_password_6) }
             <EnableReg>1</EnableReg>
+            {else}
+            <EnableReg>0</EnableReg>
+            {/if}
+            
             <ProxyAddr></ProxyAddr>
             <ProxyPort>5060</ProxyPort>
             <ProxyUser></ProxyUser>