diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index 2b749ffc84..cd2537726a 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -216,7 +216,6 @@
 		$text['description-password']['pt-pt'] = "Introduza a password.";
 		$text['description-password']['fr-fr'] = "Entrez le mot de passe.";
 
-
 		$text['label-device_time_zone']['en-us'] = "Time Zone";
 		$text['label-device_time_zone']['es-cl'] = "Zona Horaria";
 		$text['label-device_time_zone']['pt-pt'] = "Fuso Horário";
@@ -368,6 +367,11 @@
 		$text['label-blf']['pt-pt'] = "BLF";
 		$text['label-blf']['fr-fr'] = "BLF";
 
+		$text['label-blf_xfer']['en-us'] = "BLF/xfer";
+		$text['label-blf_xfer']['es-cl'] = "BLF/xfer";
+		$text['label-blf_xfer']['pt-pt'] = "BLF/xfer";
+		$text['label-blf_xfer']['fr-fr'] = "BLF/xfer";
+
 		$text['label-presence_watcher']['en-us'] = "Presence Watcher";
 		$text['label-presence_watcher']['es-cl'] = "Presencia Watcher";
 		$text['label-presence_watcher']['pt-pt'] = "Vigilante de Presença";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index b54a5dfef5..81456e007f 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -727,6 +727,16 @@ require_once "resources/require.php";
 				<select class='formfld' style='width:80px;' name='device_keys[<?php echo $x; ?>][device_key_type]'>
 				<option value=''></option>
 				<?php
+				if (strtolower($device_vendor) == "aastra" || strlen($device_vendor) == 0) {
+					if (strlen($device_vendor) == 0) { echo "<optgroup label='Aastra'>"; }
+					?>
+					<option value='blf' <?php if ($row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
+					<option value='blfxfer' <?php if ($row['device_key_type'] == "blfxfer") { echo $selected;$found=true; } ?>><?php echo $text['label-blfxfer'] ?></option>
+					<option value='dnd' <?php if ($row['device_key_type'] == "dnd") { echo $selected;$found=true; } ?>><?php echo $text['label-dnd'] ?></option>
+					<option value='speeddial' <?php if ($row['device_key_type'] == "speeddial") { echo $selected;$found=true; } ?>><?php echo $text['label-speeddial'] ?></option>
+					<?php
+					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
+				}
 				if (strtolower($device_vendor) == "cisco" || strlen($device_vendor) == 0) {
 					if (strlen($device_vendor) == 0) { echo "<optgroup label='Cisco'>"; }
 					?>