diff --git a/resources/templates/provision/yealink/t58v/y000000000058.cfg b/resources/templates/provision/yealink/t58v/y000000000058.cfg
index 832842cb6b..34229610cf 100644
--- a/resources/templates/provision/yealink/t58v/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58v/y000000000058.cfg
@@ -1155,26 +1155,29 @@ programablekey.{$row.device_key_id}.label = {$row.device_key_label}
 ###It only applies to the Local Group, XML Group and Network Group features.Integer from 0 to 48.
 #expansion_module.1.key.1.xml_phonebook =
 
-{$rownum = 1}
-
 {foreach $keys["expansion"] as $row}
-{if $rownum <= 40}
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
 expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
 expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
-{else}
-expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type}
-expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line}
-expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value}
-expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension}
-expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label}
-expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook =
-{/if}
-{$rownum = $rownum + 1}
-
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 {/foreach}
 
 #######################################################################################