diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index 915c84fc37..3e7ffc0087 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -6,7 +6,7 @@
 	$text['title-extensions']['fr-fr'] = "Extensions";
 
 	$text['title-extension-edit']['en-us'] = "Extension";
-	$text['title-extension-edit']['es-cl'] = "Editar Extensión";
+	$text['title-extension-edit']['es-cl'] = "Extensión";
 	$text['title-extension-edit']['pt-pt'] = "Extensão";
 	$text['title-extension-edit']['fr-fr'] = "Extension";
 
@@ -26,7 +26,7 @@
 	$text['description-extensions']['fr-fr'] = "Page de configuration des extensions SIP.";
 
 	$text['header-extension-edit']['en-us'] = "Extension";
-	$text['header-extension-edit']['es-cl'] = "Editar Extensión";
+	$text['header-extension-edit']['es-cl'] = "Extensión";
 	$text['header-extension-edit']['pt-pt'] = "Extensão";
 	$text['header-extension-edit']['fr-fr'] = "Extension";
 
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index e6b90ee944..40b9de7f59 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -1306,22 +1306,19 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 		echo "		</td>\n";
 		echo "		<td class='vtable'>";
+		$device = new device;
+		$template_dir = $device->get_template_dir();
 		echo "<select id='device_template' name='device_template' style='width: 90%' class='formfld'>\n";
 		echo "<option value=''></option>\n";
-		if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/provision/".$_SESSION["domain_name"])) {
-			$temp_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/provision/".$_SESSION["domain_name"];
-		} else {
-			$temp_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/provision";
-		}
-		if($dh = opendir($temp_dir)) {
+		if($dh = opendir($template_dir)) {
 			while($dir = readdir($dh)) {
 				if($file != "." && $dir != ".." && $dir[0] != '.') {
-					if(is_dir($temp_dir . "/" . $dir)) {
+					if(is_dir($template_dir . "/" . $dir)) {
 						echo "<optgroup label='$dir'>";
-						if($dh_sub = opendir($temp_dir.'/'.$dir)) {
+						if($dh_sub = opendir($template_dir.'/'.$dir)) {
 							while($dir_sub = readdir($dh_sub)) {
 								if($file_sub != '.' && $dir_sub != '..' && $dir_sub[0] != '.') {
-									if(is_dir($temp_dir . '/' . $dir .'/'. $dir_sub)) {
+									if(is_dir($template_dir . '/' . $dir .'/'. $dir_sub)) {
 										if ($device_template == $dir."/".$dir_sub) {
 											echo "<option value='".$dir."/".$dir_sub."' selected='selected'>".$dir."/".$dir_sub."</option>\n";
 										}