diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 4c784ee6b2..0f44537040 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -431,6 +431,17 @@
 	$device_keys[$x]['device_key_extension'] = '';
 	$device_keys[$x]['device_key_label'] = '';
 
+//get the vendor functions
+	$sql = "SELECT v.name as vendor_name, f.name, f.value ";
+	$sql .= "FROM v_device_vendors as v, v_device_vendor_functions as f ";
+	$sql .= "where v.device_vendor_uuid = f.device_vendor_uuid ";
+	$sql .= "and v.enabled = 'true' ";
+	$sql .= "and f.enabled = 'true' ";
+	$sql .= "order by v.name asc, f.name asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	$vendor_functions = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+
 //get device settings
 	$sql = "SELECT * FROM v_device_settings ";
 	$sql .= "WHERE device_uuid = '".$device_uuid."' ";
@@ -1075,250 +1086,38 @@
 				}
 				?>
 				<input class='formfld' type='hidden' id='key_vendor_<?php echo $x; ?>' name='device_keys[<?php echo $x; ?>][device_key_vendor]' value="<?php echo $device_key_vendor; ?>"/>
-				<?php $selected = "selected='selected'"; ?>
-				<?php $found = false; ?>
-				<select class='formfld' name='device_keys[<?php echo $x; ?>][device_key_type]' id='key_type_<?php echo $x; ?>' onchange="document.getElementById('key_vendor_<?php echo $x; ?>').value=document.getElementById('key_type_<?php echo $x; ?>').options[document.getElementById('key_type_<?php echo $x; ?>').selectedIndex].parentNode.label.toLowerCase();">
-				<option value=''></option>
 				<?php
-				if (strtolower($device_vendor) == "aastra" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
-					echo "<optgroup label='Aastra'>";
-					$match_vendor = (strtolower($device_key_vendor) == "aastra");
-					?>
-					<option value='blf' <?php if ($match_vendor && $row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
-					<option value='blfxfer' <?php if ($match_vendor && $row['device_key_type'] == "blfxfer") { echo $selected;$found=true; } ?>><?php echo $text['label-blf_xfer'] ?></option>
-					<option value='callers' <?php if ($match_vendor && $row['device_key_type'] == "callers") { echo $selected;$found=true; } ?>><?php echo $text['label-callers'] ?></option>
+echo "<select class='formfld' name='device_keys[".$x."][device_key_type]' id='key_type_".$x."'>\n";
+echo "	<option value=''></option>\n";
+$previous_vendor = '';
+$i=0;
+foreach ($vendor_functions as $function) {
+	if (strlen($row['device_key_vendor']) == 0 && $function['vendor_name'] != $previous_vendor) {
+		if ($i > 0) { echo "	</optgroup>\n"; }
+		echo "	<optgroup label='".ucwords($function['vendor_name'])."'>\n";
+	}
+	$selected = '';
+	if ($row['device_key_vendor'] == $function['vendor_name'] && $row['device_key_type'] == $function['value']) {
+		$selected = "selected='selected'";
+	}
+	if (strlen($row['device_key_vendor']) == 0) {
+		echo "		<option value='".$function['value']."' vendor='".$function['vendor_name']."' $selected >".$text['label-'.$function['name']]."</option>\n";
+	}
+	if (strlen($row['device_key_vendor']) > 0 && $row['device_key_vendor'] == $function['vendor_name']) {
+		echo "		<option value='".$function['value']."' vendor='".$function['vendor_name']."' $selected >".$text['label-'.$function['name']]."</option>\n";
+		
+	}
+	$previous_vendor = $function['vendor_name'];
+	$i++;
+	
+}
+if (strlen($row['device_key_vendor']) == 0) {
+	echo "	</optgroup>\n";
+}
+echo "</select>\n";
 
-					<option value='dnd' <?php if ($match_vendor && $row['device_key_type'] == "dnd") { echo $selected;$found=true; } ?>><?php echo $text['label-dnd'] ?></option>
-					<option value='speeddial' <?php if ($match_vendor && $row['device_key_type'] == "speeddial") { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial'] ?></option>
-					<option value='xfer' <?php if ($match_vendor && $row['device_key_type'] == "xfer") { echo $selected;$found=true; } ?>><?php echo $text['label-xfer'] ?></option>
-
-					<?php
-					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
-				}
-				if (strtolower($device_vendor) == "cisco" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
-					echo "<optgroup label='Cisco'>";
-					$match_vendor = (strtolower($device_key_vendor) == "cisco");
-					?>
-					<option value='blf' <?php if ($match_vendor && $row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
-					<option value='line' <?php if ($match_vendor && $row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
-					<option value='disabled' <?php if ($match_vendor && $row['device_key_type'] == "disabled") { echo $selected;$found=true; } ?>><?php echo $text['label-disabled'] ?></option>
-					<?php
-					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
-				}
-				if (strtolower($device_vendor) == "escene" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
-					?>
-					<?php echo "<optgroup label='Escene'>"; ?>
-					<?php $match_vendor = (strtolower($device_key_vendor) == "escene"); ?>
-					<option value='1'  <?php if ($match_vendor && $row['device_key_type'] == '1' ) { echo $selected;$found=true; } ?>><?php echo $text['label-blf']               ?></option>
-					<option value='7'  <?php if ($match_vendor && $row['device_key_type'] == '7' ) { echo $selected;$found=true; } ?>><?php echo $text['label-call_park']         ?></option>
-					<option value='4'  <?php if ($match_vendor && $row['device_key_type'] == '4' ) { echo $selected;$found=true; } ?>><?php echo $text['label-dtmf']              ?></option>
-					<option value='5'  <?php if ($match_vendor && $row['device_key_type'] == '5' ) { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial']        ?></option>
-					<option value='2'  <?php if ($match_vendor && $row['device_key_type'] == '2' ) { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial_prefix'] ?></option>
-					<option value='8'  <?php if ($match_vendor && $row['device_key_type'] == '8' ) { echo $selected;$found=true; } ?>><?php echo $text['label-intercom']          ?></option>
-					<option value='9'  <?php if ($match_vendor && $row['device_key_type'] == '9' ) { echo $selected;$found=true; } ?>><?php echo $text['label-pickup']            ?></option>
-					<option value='11' <?php if ($match_vendor && $row['device_key_type'] == '11') { echo $selected;$found=true; } ?>><?php echo $text['label-broadsoft_group']   ?></option>
-					<?php /*BLA type 3 Paging type 6*/ ?>
-					<?php echo "</optgroup>"; ?>
-					<?php echo "<optgroup label='Escene programmable'>"; ?>
-					<?php $match_vendor = (strtolower($device_key_vendor) == "escene programmable"); ?>
-					<option value='0'   <?php if ($match_vendor && $row['device_key_type'] == '0' ) { echo $selected;$found=true; } ?>><?php echo $text['label-default']          ?></option> <?php /* 0  - Default                    */?>
-					<option value='1'   <?php if ($match_vendor && $row['device_key_type'] == '1' ) { echo $selected;$found=true; } ?>><?php echo $text['label-redial']           ?></option> <?php /* 1  - Redial                     */?>
-					<option value='2'   <?php if ($match_vendor && $row['device_key_type'] == '2' ) { echo $selected;$found=true; } ?>><?php echo $text['label-dnd']              ?></option> <?php /* 2  - DND                        */?>
-					<option value='3'   <?php if ($match_vendor && $row['device_key_type'] == '3' ) { echo $selected;$found=true; } ?>><?php echo $text['label-phone_book']       ?></option> <?php /* 3  - Contacts                   */?>
-					<option value='4'   <?php if ($match_vendor && $row['device_key_type'] == '4' ) { echo $selected;$found=true; } ?>><?php echo $text['label-ent_phone_book']   ?></option> <?php /* 4  - Enterprise Phonebook       */?>
-					<option value='5'   <?php if ($match_vendor && $row['device_key_type'] == '5' ) { echo $selected;$found=true; } ?>><?php echo $text['label-ldap']             ?></option> <?php /* 5  - LDAP                       */?>
-					<option value='6'   <?php if ($match_vendor && $row['device_key_type'] == '6' ) { echo $selected;$found=true; } ?>><?php echo $text['label-directory']        ?></option> <?php /* 6  - Dir                        */?>
-					<option value='7'   <?php if ($match_vendor && $row['device_key_type'] == '7' ) { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial']       ?></option> <?php /* 7  - Speed Dial                 */?>
-					<option value='8'   <?php if ($match_vendor && $row['device_key_type'] == '8' ) { echo $selected;$found=true; } ?>><?php echo $text['label-call_log']         ?></option> <?php /* 8  - Call List                  */?>
-					<option value='9'   <?php if ($match_vendor && $row['device_key_type'] == '9' ) { echo $selected;$found=true; } ?>><?php echo $text['label-missed_calls']     ?></option> <?php /* 9  - Missed Calls               */?>
-					<option value='10'  <?php if ($match_vendor && $row['device_key_type'] == '10') { echo $selected;$found=true; } ?>><?php echo $text['label-received_calls']   ?></option> <?php /* 10 - Received Calls             */?>
-					<option value='11'  <?php if ($match_vendor && $row['device_key_type'] == '11') { echo $selected;$found=true; } ?>><?php echo $text['label-dialed_calls']     ?></option> <?php /* 11 - Dialed Calls               */?>
-					<option value='12'  <?php if ($match_vendor && $row['device_key_type'] == '12') { echo $selected;$found=true; } ?>><?php echo $text['label-menu']             ?></option> <?php /* 12 - Menu                       */?>
-					<option value='13'  <?php if ($match_vendor && $row['device_key_type'] == '13') { echo $selected;$found=true; } ?>><?php echo $text['label-sms']              ?></option> <?php /* 13 - SMS                        */?>
-					<option value='14'  <?php if ($match_vendor && $row['device_key_type'] == '14') { echo $selected;$found=true; } ?>><?php echo $text['label-new_sms']          ?></option> <?php /* 14 - New SMS                    */?>
-					<option value='15'  <?php if ($match_vendor && $row['device_key_type'] == '15') { echo $selected;$found=true; } ?>><?php echo $text['label-forward']          ?></option> <?php /* 15 - Call Forward               */?>
-					<option value='16'  <?php if ($match_vendor && $row['device_key_type'] == '16') { echo $selected;$found=true; } ?>><?php echo $text['label-status']           ?></option> <?php /* 16 - View Status                */?>
-					<option value='17'  <?php if ($match_vendor && $row['device_key_type'] == '17') { echo $selected;$found=true; } ?>><?php echo $text['label-enable_account']   ?></option> <?php /* 17 - Enable/Disable SIP Account */?>
-					<option value='19'  <?php if ($match_vendor && $row['device_key_type'] == '19') { echo $selected;$found=true; } ?>><?php echo $text['label-provison_now']     ?></option> <?php /* 19 - Auto Provison Now          */?>
-					<option value='20'  <?php if ($match_vendor && $row['device_key_type'] == '20') { echo $selected;$found=true; } ?>><?php echo $text['label-hot_desking']      ?></option> <?php /* 20 - Hot Desking                */?>
-					<?php /*<option value='18'  <?php if ($match_vendor && $row['device_key_type'] == '18') { echo $selected;$found=true; } ?>><?php echo $text['label-xml browser']   ?></option> */?> <?php /* 18 - XML Browser                */?>
-					<?php echo "</optgroup>";
-				}
-				if (strtolower($device_vendor) == "grandstream" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
-					echo "<optgroup label='Grandstream'>";
-					$match_vendor = (strtolower($device_key_vendor) == "grandstream");
-					?>
-					<option value='line' <?php if ($match_vendor && $row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
-					<option value='shared line' <?php if ($match_vendor && $row['device_key_type'] == "shared line") { echo $selected;$found=true; } ?>><?php echo $text['label-shared_line'] ?></option>
-					<option value='speed dial' <?php if ($match_vendor && $row['device_key_type'] == "speed dial") { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial'] ?></option>
-					<option value='blf' <?php if ($match_vendor && $row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
-					<option value='presence watcher' <?php if ($match_vendor && $row['device_key_type'] == "presence watcher") { echo $selected;$found=true; } ?>><?php echo $text['label-presence_watcher'] ?></option>
-					<option value='eventlist blf' <?php if ($match_vendor && $row['device_key_type'] == "eventlist blf") { echo $selected;$found=true; } ?>><?php echo $text['label-eventlist_blf'] ?></option>
-					<option value='speed dial active' <?php if ($match_vendor && $row['device_key_type'] == "speed dial active") { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial_active'] ?></option>
-					<option value='dial dtmf' <?php if ($match_vendor && $row['device_key_type'] == "dial dtmf") { echo $selected;$found=true; } ?>><?php echo $text['label-dial_dtmf'] ?></option>
-					<option value='voicemail' <?php if ($match_vendor && $row['device_key_type'] == "voicemail") { echo $selected;$found=true; } ?>><?php echo $text['label-voicemail'] ?></option>
-					<option value='call return' <?php if ($match_vendor && $row['device_key_type'] == "call return") { echo $selected;$found=true; } ?>><?php echo $text['label-call_return'] ?></option>
-					<option value='transfer' <?php if ($match_vendor && $row['device_key_type'] == "transfer") { echo $selected;$found=true; } ?>><?php echo $text['label-transfer'] ?></option>
-					<option value='call park' <?php if ($match_vendor && $row['device_key_type'] == "call park") { echo $selected;$found=true; } ?>><?php echo $text['label-call_park'] ?></option>
-					<option value='intercom' <?php if ($match_vendor && $row['device_key_type'] == "intercom") { echo $selected;$found=true; } ?>><?php echo $text['label-intercom'] ?></option>
-					<option value='ldap search' <?php if ($match_vendor && $row['device_key_type'] == "ldap search") { echo $selected;$found=true; } ?>><?php echo $text['label-ldap_search'] ?></option>
-					<?php
-					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
-				}
-				if (strtolower($device_vendor) == "mitel" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
-					echo "<optgroup label='Mitel'>";
-					$match_vendor = (strtolower($device_key_vendor) == "mitel");
-					?>
-					<option value='0' <?php if ($match_vendor && $row['device_key_type'] == "0") { echo $selected;$found=true; } ?>><?php echo $text['label-not_programmed'] ?></option>
-					<option value='1' <?php if ($match_vendor && $row['device_key_type'] == "1") { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial'] ?></option>
-					<option value='5' <?php if ($match_vendor && $row['device_key_type'] == "5") { echo $selected;$found=true; } ?>><?php echo $text['label-shared_line'] ?></option>
-					<option value='6' <?php if ($match_vendor && $row['device_key_type'] == "6") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
-					<option value='2' <?php if ($match_vendor && $row['device_key_type'] == "2") { echo $selected;$found=true; } ?>><?php echo $text['label-call_log'] ?></option>
-					<option value='15' <?php if ($match_vendor && $row['device_key_type'] == "15") { echo $selected;$found=true; } ?>><?php echo $text['label-phone_book'] ?></option>
-					<option value='16' <?php if ($match_vendor && $row['device_key_type'] == "16") { echo $selected;$found=true; } ?>><?php echo $text['label-forward'] ?></option>
-					<option value='17' <?php if ($match_vendor && $row['device_key_type'] == "17") { echo $selected;$found=true; } ?>><?php echo $text['label-dnd'] ?></option>
-					<option value='3' <?php if ($match_vendor && $row['device_key_type'] == "3") { echo $selected;$found=true; } ?>><?php echo $text['label-advisory_message'] ?></option>
-					<option value='18' <?php if ($match_vendor && $row['device_key_type'] == "18") { echo $selected;$found=true; } ?>><?php echo $text['label-pc_application'] ?></option>
-					<option value='4' <?php if ($match_vendor && $row['device_key_type'] == "4") { echo $selected;$found=true; } ?>><?php echo $text['label-headset_on_off'] ?></option>
-					<option value='19' <?php if ($match_vendor && $row['device_key_type'] == "19") { echo $selected;$found=true; } ?>><?php echo $text['label-rss_feed'] ?></option>
-					<option value='27' <?php if ($match_vendor && $row['device_key_type'] == "27") { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial_blf'] ?></option>
-					<option value='19' <?php if ($match_vendor && $row['device_key_type'] == "19") { echo $selected;$found=true; } ?>><?php echo $text['label-url'] ?></option>
-					<!--
-					0 - not programmed
-					1 - speed dial
-					2 - callLog
-					3 - advisoryMsg (on/off)
-					4 - headset(on/off)
-					5 - shared line
-					6 - Line 1
-					7 - Line 2
-					8 - Line 3
-					9 - Line 4
-					10 - Line 5
-					11 - Line 6
-					12 - Line 7
-					13 - Line 8
-					15 - phonebook
-					16 - call forwarding
-					17 - do not disturb
-					18 - PC Application
-					19 - RSS Feed URL / Branding /Notes
-					21 - Superkey (5304 set only)
-					22 - Redial key (5304 set only)
-					23 - Hold key (5304 set only)
-					24 - Trans/Conf key (5304 set only)
-					25 - Message key (5304 set only)
-					26 - Cancel key (5304 set only)
-					27 - Speed Dial & BLF
-
-					Mitel web interface shows html_application
-					-->
-					<?php
-					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
-				}
-				if (strtolower($device_vendor) == "polycom" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
-					echo "<optgroup label='Polycom'>";
-					$match_vendor = (strtolower($device_key_vendor) == "polycom");
-					?>
-					<option value='line' <?php if ($match_vendor && $row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
-					<option value='automata' <?php if ($match_vendor && $row['device_key_type'] == "automata") { echo $selected;$found=true; } ?>><?php echo $text['label-automata'] ?></option>
-					<option value='normal' <?php if ($match_vendor && $row['device_key_type'] == "normal") { echo $selected;$found=true; } ?>><?php echo $text['label-normal'] ?></option>
-					<option value='Messages' <?php if ($match_vendor && $row['device_key_type'] == "Messages") { echo $selected;$found=true; } ?>><?php echo $text['label-messages'] ?></option>
-					<option value='MicMute' <?php if ($match_vendor && $row['device_key_type'] == "MicMute") { echo $selected;$found=true; } ?>><?php echo $text['label-micmute'] ?></option>
-					<option value='Redial' <?php if ($match_vendor && $row['device_key_type'] == "Redial") { echo $selected;$found=true; } ?>><?php echo $text['label-redial'] ?></option>
-					<option value='Null' <?php if ($match_vendor && $row['device_key_type'] == "Null") { echo $selected;$found=true; } ?>><?php echo $text['label-null'] ?></option>
-					<option value='SpeedDial' <?php if ($match_vendor && $row['device_key_type'] == "SpeedDial") { echo $selected;$found=true; } ?>><?php echo $text['label-speeddial'] ?></option>
-					<option value='SpeedDialMenu' <?php if ($match_vendor && $row['device_key_type'] == "SpeedDialMenu") { echo $selected;$found=true; } ?>><?php echo $text['label-speeddialmenu'] ?></option>
-					<option value='URL' <?php if ($match_vendor && $row['device_key_type'] == "URL") { echo $selected;$found=true; } ?>><?php echo $text['label-url'] ?></option>
-					<?php
-					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
-				}
-				if (strtolower($device_vendor) == "snom" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
-					echo "<optgroup label='Snom'>";
-					$match_vendor = (strtolower($device_key_vendor) == "snom");
-					?>
-					<option value='none' <?php if ($match_vendor && $row['device_key_type'] == "none") { echo $selected;$found=true; } ?>><?php echo $text['label-none'] ?></option>
-					<option value='url' <?php if ($match_vendor && $row['device_key_type'] == "url") { echo $selected;$found=true; } ?>><?php echo $text['label-action_url'] ?></option>
-					<option value='auto_answer' <?php if ($match_vendor && $row['device_key_type'] == "auto_answer") { echo $selected;$found=true; } ?>><?php echo $text['label-auto_answer'] ?></option>
-					<option value='blf' <?php if ($match_vendor && $row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
-					<option value='button' <?php if ($match_vendor && $row['device_key_type'] == "button") { echo $selected;$found=true; } ?>><?php echo $text['label-button'] ?></option>
-					<option value='call_agent' <?php if ($match_vendor && $row['device_key_type'] == "call_agent") { echo $selected;$found=true; } ?>><?php echo $text['label-call_agent'] ?></option>
-					<option value='conference' <?php if ($match_vendor && $row['device_key_type'] == "conference") { echo $selected;$found=true; } ?>><?php echo $text['label-conference'] ?></option>
-					<option value='dtmf' <?php if ($match_vendor && $row['device_key_type'] == "dtmf") { echo $selected;$found=true; } ?>><?php echo $text['label-dtmf'] ?></option>
-					<option value='dest' <?php if ($match_vendor && $row['device_key_type'] == "dest") { echo $selected;$found=true; } ?>><?php echo $text['label-extension'] ?></option>
-					<option value='redirect' <?php if ($match_vendor && $row['device_key_type'] == "redirect") { echo $selected;$found=true; } ?>><?php echo $text['label-redirect'] ?></option>
-					<option value='icom' <?php if ($match_vendor && $row['device_key_type'] == "icom") { echo $selected;$found=true; } ?>><?php echo $text['label-intercom'] ?></option>
-					<option value='ivr' <?php if ($match_vendor && $row['device_key_type'] == "ivr") { echo $selected;$found=true; } ?>><?php echo $text['label-ivr'] ?></option>
-					<option value='keyevent' <?php if ($match_vendor && $row['device_key_type'] == "keyevent") { echo $selected;$found=true; } ?>><?php echo $text['label-key_event'] ?></option>
-					<option value='line' <?php if ($match_vendor && $row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
-					<option value='multicast' <?php if ($match_vendor && $row['device_key_type'] == "multicast") { echo $selected;$found=true; } ?>><?php echo $text['label-multicast_page'] ?></option>
-					<option value='orbit' <?php if ($match_vendor && $row['device_key_type'] == "orbit") { echo $selected;$found=true; } ?>><?php echo $text['label-orbit'] ?></option>
-					<option value='presence' <?php if ($match_vendor && $row['device_key_type'] == "presence") { echo $selected;$found=true; } ?>><?php echo $text['label-presence'] ?></option>
-					<option value='p2t' <?php if ($match_vendor && $row['device_key_type'] == "p2t") { echo $selected;$found=true; } ?>><?php echo $text['label-p2t'] ?></option>
-					<option value='mult' <?php if ($match_vendor && $row['device_key_type'] == "mult") { echo $selected;$found=true; } ?>><?php echo $text['label-shared_line'] ?></option>
-					<option value='speed' <?php if ($match_vendor && $row['device_key_type'] == "speed") { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial'] ?></option>
-					<option value='transfer' <?php if ($match_vendor && $row['device_key_type'] == "transfer") { echo $selected;$found=true; } ?>><?php echo $text['label-transfer'] ?></option>
-					<option value='recorder' <?php if ($match_vendor && $row['device_key_type'] == "recorder") { echo $selected;$found=true; } ?>><?php echo $text['label-record'] ?></option>
-					<?php
-					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
-				}
-				if (strtolower($device_vendor) == "yealink" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
-					echo "<optgroup label='Yealink'>";
-					$match_vendor = (strtolower($device_key_vendor) == "yealink");
-					?>
-					<option value='0' <?php if ($match_vendor && $row['device_key_type'] == "0") { echo $selected;$found=true; } ?>><?php echo $text['label-na'] ?></option>
-					<option value='15' <?php if ($match_vendor && $row['device_key_type'] == "15") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
-					<option value='1' <?php if ($match_vendor && $row['device_key_type'] == "1") { echo $selected;$found=true; } ?>><?php echo $text['label-conference'] ?></option>
-					<option value='2' <?php if ($match_vendor && $row['device_key_type'] == "2") { echo $selected;$found=true; } ?>><?php echo $text['label-forward'] ?></option>
-					<option value='3' <?php if ($match_vendor && $row['device_key_type'] == "3") { echo $selected;$found=true; } ?>><?php echo $text['label-transfer'] ?></option>
-					<option value='4' <?php if ($match_vendor && $row['device_key_type'] == "4") { echo $selected;$found=true; } ?>><?php echo $text['label-hold'] ?></option>
-					<option value='5' <?php if ($match_vendor && $row['device_key_type'] == "5") { echo $selected;$found=true; } ?>><?php echo $text['label-dnd'] ?></option>
-					<option value='6' <?php if ($match_vendor && $row['device_key_type'] == "6") { echo $selected;$found=true; } ?>><?php echo $text['label-redial'] ?></option>
-					<option value='7' <?php if ($match_vendor && $row['device_key_type'] == "7") { echo $selected;$found=true; } ?>><?php echo $text['label-call_return'] ?></option>
-					<option value='8' <?php if ($match_vendor && $row['device_key_type'] == "8") { echo $selected;$found=true; } ?>><?php echo $text['label-sms'] ?></option>
-					<option value='9' <?php if ($match_vendor && $row['device_key_type'] == "9") { echo $selected;$found=true; } ?>><?php echo $text['label-call_pickup'] ?></option>
-					<option value='10' <?php if ($match_vendor && $row['device_key_type'] == "10") { echo $selected;$found=true; } ?>><?php echo $text['label-call_park'] ?></option>
-					<option value='11' <?php if ($match_vendor && $row['device_key_type'] == "11") { echo $selected;$found=true; } ?>><?php echo $text['label-dtmf'] ?></option>
-					<option value='12' <?php if ($match_vendor && $row['device_key_type'] == "12") { echo $selected;$found=true; } ?>><?php echo $text['label-voicemail'] ?></option>
-					<option value='13' <?php if ($match_vendor && $row['device_key_type'] == "13") { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial'] ?></option>
-					<option value='14' <?php if ($match_vendor && $row['device_key_type'] == "14") { echo $selected;$found=true; } ?>><?php echo $text['label-intercom'] ?></option>
-					<option value='16' <?php if ($match_vendor && $row['device_key_type'] == "16") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
-					<option value='17' <?php if ($match_vendor && $row['device_key_type'] == "17") { echo $selected;$found=true; } ?>><?php echo $text['label-url'] ?></option>
-					<option value='19' <?php if ($match_vendor && $row['device_key_type'] == "19") { echo $selected;$found=true; } ?>><?php echo $text['label-public_hold'] ?></option>
-					<option value='20' <?php if ($match_vendor && $row['device_key_type'] == "20") { echo $selected;$found=true; } ?>><?php echo $text['label-private'] ?></option>
-					<option value='21' <?php if ($match_vendor && $row['device_key_type'] == "21") { echo $selected;$found=true; } ?>><?php echo $text['label-shared_line'] ?></option>
-					<option value='22' <?php if ($match_vendor && $row['device_key_type'] == "22") { echo $selected;$found=true; } ?>><?php echo $text['label-xml_group'] ?></option>
-					<option value='23' <?php if ($match_vendor && $row['device_key_type'] == "23") { echo $selected;$found=true; } ?>><?php echo $text['label-group_pickup'] ?></option>
-					<option value='24' <?php if ($match_vendor && $row['device_key_type'] == "24") { echo $selected;$found=true; } ?>><?php echo $text['label-paging'] ?></option>
-					<option value='25' <?php if ($match_vendor && $row['device_key_type'] == "25") { echo $selected;$found=true; } ?>><?php echo $text['label-record'] ?></option>
-					<option value='27' <?php if ($match_vendor && $row['device_key_type'] == "27") { echo $selected;$found=true; } ?>><?php echo $text['label-xml_browser'] ?></option>
-					<option value='28' <?php if ($match_vendor && $row['device_key_type'] == "28") { echo $selected;$found=true; } ?>><?php echo $text['label-history'] ?></option>
-					<option value='29' <?php if ($match_vendor && $row['device_key_type'] == "29") { echo $selected;$found=true; } ?>><?php echo $text['label-directory'] ?></option>
-					<option value='30' <?php if ($match_vendor && $row['device_key_type'] == "30") { echo $selected;$found=true; } ?>><?php echo $text['label-menu'] ?></option>
-					<option value='32' <?php if ($match_vendor && $row['device_key_type'] == "32") { echo $selected;$found=true; } ?>><?php echo $text['label-new_sms'] ?></option>
-					<option value='33' <?php if ($match_vendor && $row['device_key_type'] == "33") { echo $selected;$found=true; } ?>><?php echo $text['label-status'] ?></option>
-					<option value='34' <?php if ($match_vendor && $row['device_key_type'] == "34") { echo $selected;$found=true; } ?>><?php echo $text['label-hot_desking'] ?></option>
-					<option value='35' <?php if ($match_vendor && $row['device_key_type'] == "35") { echo $selected;$found=true; } ?>><?php echo $text['label-url_record'] ?></option>
-					<option value='38' <?php if ($match_vendor && $row['device_key_type'] == "38") { echo $selected;$found=true; } ?>><?php echo $text['label-ldap'] ?></option>
-					<option value='39' <?php if ($match_vendor && $row['device_key_type'] == "39") { echo $selected;$found=true; } ?>><?php echo $text['label-blf_list'] ?></option>
-					<option value='40' <?php if ($match_vendor && $row['device_key_type'] == "40") { echo $selected;$found=true; } ?>><?php echo $text['label-prefix'] ?></option>
-					<option value='41' <?php if ($match_vendor && $row['device_key_type'] == "41") { echo $selected;$found=true; } ?>><?php echo $text['label-zero_sp_touch'] ?></option>
-					<option value='42' <?php if ($match_vendor && $row['device_key_type'] == "42") { echo $selected;$found=true; } ?>><?php echo $text['label-acd'] ?></option>
-					<option value='43' <?php if ($match_vendor && $row['device_key_type'] == "43") { echo $selected;$found=true; } ?>><?php echo $text['label-local_phonebook'] ?></option>
-					<option value='44' <?php if ($match_vendor && $row['device_key_type'] == "44") { echo $selected;$found=true; } ?>><?php echo $text['label-broadsoft_phonebook'] ?></option>
-					<option value='45' <?php if ($match_vendor && $row['device_key_type'] == "45") { echo $selected;$found=true; } ?>><?php echo $text['label-local_group'] ?></option>
-					<option value='46' <?php if ($match_vendor && $row['device_key_type'] == "46") { echo $selected;$found=true; } ?>><?php echo $text['label-broadsoft_group'] ?></option>
-					<option value='47' <?php if ($match_vendor && $row['device_key_type'] == "47") { echo $selected;$found=true; } ?>><?php echo $text['label-xml_phonebook'] ?></option>
-					<option value='48' <?php if ($match_vendor && $row['device_key_type'] == "48") { echo $selected;$found=true; } ?>><?php echo $text['label-switch_account_up'] ?></option>
-					<option value='49' <?php if ($match_vendor && $row['device_key_type'] == "49") { echo $selected;$found=true; } ?>><?php echo $text['label-switch_account_down'] ?></option>
-					<option value='50' <?php if ($match_vendor && $row['device_key_type'] == "50") { echo $selected;$found=true; } ?>><?php echo $text['label-keypad_lock'] ?></option>
-					<?php
-					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
-				}
-				?>
-				</select>
-
-				<?php
+//if (strtolower($device_vendor) == "aastra" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
+//if ($match_vendor && $row['device_key_type'] == "blf") { echo $selected;$found=true; }
 				echo "</td>\n";
 				echo "<td valign='top' align='left' nowrap='nowrap'>\n";
 				echo "	<select class='formfld' name='device_keys[".$x."][device_key_line]'>\n";