diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg
index 030f1eaa47..31b6d2465d 100644
--- a/resources/templates/provision/yealink/t46s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg
@@ -136,61 +136,87 @@ account.6.phone_setting.call_appearance.calls_per_linekey=
 #######################################################################################
 ##                                    Codec                                          ##       
 #######################################################################################
-account.1.codec.ilbc_15_2kbps.priority=
-account.1.codec.ilbc_15_2kbps.enable=
-account.1.codec.ilbc_13_33kbps.priority=
-account.1.codec.ilbc_13_33kbps.enable =
-account.1.codec.pcma.enable=
-account.1.codec.pcma.priority=
-account.1.codec.pcmu.enable=
-account.1.codec.pcmu.priority=
-account.1.codec.opus.priority =
-account.1.codec.opus.enable=
-account.1.codec.opus.para=
-account.1.codec.g726_40.enable=
-account.1.codec.g726_40.priority=
-account.1.codec.g726_32.enable=
-account.1.codec.g726_32.priority=
-account.1.codec.g726_24.enable=
-account.1.codec.g726_24.priority=
-account.1.codec.g726_16.enable=
-account.1.codec.g726_16.priority=
-account.1.codec.g723_63.priority=
-account.1.codec.g723_63.enable=
-account.1.codec.g723_53.priority=
-account.1.codec.g723_53.enable=
-account.1.codec.g729.priority=
-account.1.codec.g729.enable=
-account.1.codec.g722.priority=
-account.1.codec.g722.enable=
 
-account.2.codec.ilbc_15_2kbps.priority=
-account.2.codec.ilbc_15_2kbps.enable=
-account.2.codec.ilbc_13_33kbps.priority=
+account.1.codec.ilbc_15_2kbps.priority =
+account.1.codec.ilbc_15_2kbps.enable =
+
+account.1.codec.ilbc_13_33kbps.priority =
+account.1.codec.ilbc_13_33kbps.enable =
+
+account.1.codec.pcma.enable =
+account.1.codec.pcma.priority =
+
+account.1.codec.pcmu.enable =
+account.1.codec.pcmu.priority =
+
+account.1.codec.opus.priority =
+account.1.codec.opus.enable =
+account.1.codec.opus.para =
+
+account.1.codec.g726_40.enable =
+account.1.codec.g726_40.priority =
+
+account.1.codec.g726_32.enable =
+account.1.codec.g726_32.priority =
+
+account.1.codec.g726_24.enable =
+account.1.codec.g726_24.priority =
+
+account.1.codec.g726_16.enable =
+account.1.codec.g726_16.priority =
+
+account.1.codec.g723_63.priority =
+account.1.codec.g723_63.enable =
+
+account.1.codec.g723_53.priority =
+account.1.codec.g723_53.enable =
+
+account.1.codec.g729.priority =
+account.1.codec.g729.enable =
+
+account.1.codec.g722.priority =
+account.1.codec.g722.enable =
+
+
+account.2.codec.ilbc_15_2kbps.priority =
+account.2.codec.ilbc_15_2kbps.enable =
+
+account.2.codec.ilbc_13_33kbps.priority =
 account.2.codec.ilbc_13_33kbps.enable =
-account.2.codec.pcma.enable=
-account.2.codec.pcma.priority=
-account.2.codec.pcmu.enable=
-account.2.codec.pcmu.priority=
+
+account.2.codec.pcma.enable =
+account.2.codec.pcma.priority =
+
+account.2.codec.pcmu.enable =
+account.2.codec.pcmu.priority =
+
 account.2.codec.opus.priority =
-account.2.codec.opus.enable=
-account.2.codec.opus.para=
-account.2.codec.g726_40.enable=
-account.2.codec.g726_40.priority=
-account.2.codec.g726_32.enable=
-account.2.codec.g726_32.priority=
-account.2.codec.g726_24.enable=
-account.2.codec.g726_24.priority=
-account.2.codec.g726_16.enable=
-account.2.codec.g726_16.priority=
-account.2.codec.g723_63.priority=
-account.2.codec.g723_63.enable=
-account.2.codec.g723_53.priority=
-account.2.codec.g723_53.enable=
-account.2.codec.g729.priority=
-account.2.codec.g729.enable=
-account.2.codec.g722.priority=
-account.2.codec.g722.enable=
+account.2.codec.opus.enable =
+account.2.codec.opus.para =
+
+account.2.codec.g726_40.enable =
+account.2.codec.g726_40.priority =
+
+account.2.codec.g726_32.enable =
+account.2.codec.g726_32.priority =
+
+account.2.codec.g726_24.enable =
+account.2.codec.g726_24.priority =
+
+account.2.codec.g726_16.enable =
+account.2.codec.g726_16.priority =
+
+account.2.codec.g723_63.priority =
+account.2.codec.g723_63.enable =
+
+account.2.codec.g723_53.priority =
+account.2.codec.g723_53.enable =
+
+account.2.codec.g729.priority =
+account.2.codec.g729.enable =
+
+account.2.codec.g722.priority =
+account.2.codec.g722.enable =
 
 ################################################################
 #                      Account Register                       ##
@@ -254,7 +280,7 @@ account.1.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
 account.1.outbound_proxy_fallback_interval = 120
 {/if}
 
-account.1.nat.nat_traversal=
+account.1.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
 
 
 {if isset($user_password_2) }
@@ -316,7 +342,7 @@ account.2.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
 account.2.outbound_proxy_fallback_interval = 120
 {/if}
 
-account.2.nat.nat_traversal=
+account.2.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
 
 
 ################################################################