diff --git a/app/dialplan_outbound/app_languages.php b/app/dialplan_outbound/app_languages.php
index 7a6bd9b06b..dcfe75f24c 100644
--- a/app/dialplan_outbound/app_languages.php
+++ b/app/dialplan_outbound/app_languages.php
@@ -102,12 +102,12 @@
 	$text['label-north-america']['fr-fr'] = "Amérique du Nord";
 
 	$text['label-north-america-intl']['en-us'] = "North America International";
-	$text['label-north-america-intl']['es-cl'] = "America del Norte, Internacional";
+	$text['label-north-america-intl']['es-cl'] = "America del Norte Internacional";
 	$text['label-north-america-intl']['pt-pt'] = "América do Norte Internacional";
 	$text['label-north-america-intl']['fr-fr'] = "Amérique du Nord International";
 
 	$text['label-europe-intl']['en-us'] = "Europe International";
-	$text['label-europe-intl']['es-cl'] = "Europa, Internacional";
+	$text['label-europe-intl']['es-cl'] = "Europa Internacional";
 	$text['label-europe-intl']['pt-pt'] = "Europa Internacional";
 	$text['label-europe-intl']['fr-fr'] = "Europe International";
 
diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index 923d9fb419..c2c87a20a5 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -176,7 +176,7 @@
 				//write the xml files
 					$sql = "SELECT * FROM v_extensions AS e, v_voicemails AS v ";
 					$sql .= "WHERE e.domain_uuid = '$domain_uuid' ";
-					$sql .= "AND e.number_alias = v.voicemail_id ";
+					$sql .= "AND (e.extension = v.voicemail_id or e.number_alias = v.voicemail_id) ";
 					$sql .= "ORDER BY e.call_group ASC ";
 					$prep_statement = $db->prepare(check_sql($sql));
 					$prep_statement->execute();