diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index c003eb4256..2b749ffc84 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -36,10 +36,10 @@
 		$text['description-device_mac_address']['pt-pt'] = "Introduza o endereço MAC.";
 		$text['description-device_mac_address']['fr-fr'] = "";
 
-		$text['label-extension']['en-us'] = "Extensions";
-		$text['label-extension']['es-cl'] = "Extensiones";
-		$text['label-extension']['pt-pt'] = "Extensões";
-		$text['label-extension']['fr-fr'] = "Extensions";
+		$text['label-extension']['en-us'] = "Extension";
+		$text['label-extension']['es-cl'] = "Extension";
+		$text['label-extension']['pt-pt'] = "Extensõe";
+		$text['label-extension']['fr-fr'] = "Extension";
 
 		$text['description-extension']['en-us'] = "Assign the extension and line numbers to the device.";
 		$text['description-extension']['es-cl'] = "Asignar la etensión y números de línea al dispositivo";
@@ -373,6 +373,11 @@
 		$text['label-presence_watcher']['pt-pt'] = "Vigilante de Presença";
 		$text['label-presence_watcher']['fr-fr'] = "Présence Watcher";
 
+		$text['label-presence']['en-us'] = "Presence";
+		$text['label-presence']['es-cl'] = "Presencia";
+		$text['label-presence']['pt-pt'] = "Presença";
+		$text['label-presence']['fr-fr'] = "Présence";
+
 		$text['label-eventlist_blf']['en-us'] = "Eventlist BLF";
 		$text['label-eventlist_blf']['es-cl'] = "Eventlist BLF";
 		$text['label-eventlist_blf']['pt-pt'] = "Eventlist BLF";
@@ -398,6 +403,11 @@
 		$text['label-dial_dtmf']['pt-pt'] = "Marque DTMF";
 		$text['label-dial_dtmf']['fr-fr'] = "Composez DTMF";
 
+		$text['label-dtmf']['en-us'] = "DTMF";
+		$text['label-dtmf']['es-cl'] = "DTMF";
+		$text['label-dtmf']['pt-pt'] = "DTMF";
+		$text['label-dtmf']['fr-fr'] = "DTMF";
+
 		$text['label-transfer']['en-us'] = "Transfer";
 		$text['label-transfer']['es-cl'] = "Transferencia";
 		$text['label-transfer']['pt-pt'] = "Transferência";
@@ -503,6 +513,61 @@
 		$text['label-record']['pt-pt'] = "Registo";
 		$text['label-record']['fr-fr'] = "Record";
 
+		$text['label-none']['en-us'] = "None";
+		$text['label-none']['es-cl'] = "Ninguno";
+		$text['label-none']['pt-pt'] = "Nenhum";
+		$text['label-none']['fr-fr'] = "Aucun";
+
+		$text['label-action_url']['en-us'] = "Action URL";
+		$text['label-action_url']['es-cl'] = "URL Acción";
+		$text['label-action_url']['pt-pt'] = "URL ação";
+		$text['label-action_url']['fr-fr'] = "URL d'action";
+
+		$text['label-auto_answer']['en-us'] = "Auto Answer";
+		$text['label-auto_answer']['es-cl'] = "Respuesta Automática";
+		$text['label-auto_answer']['pt-pt'] = "Resposta Automática";
+		$text['label-auto_answer']['fr-fr'] = "Réponse Automatique";
+
+		$text['label-call_agent']['en-us'] = "Call Agent";
+		$text['label-call_agent']['es-cl'] = "Llame Agente";
+		$text['label-call_agent']['pt-pt'] = "Call Agent";
+		$text['label-call_agent']['fr-fr'] = "Agent d'appel";
+
+		$text['label-redirect']['en-us'] = "Redirect";
+		$text['label-redirect']['es-cl'] = "Redirigir";
+		$text['label-redirect']['pt-pt'] = "Redirecionar";
+		$text['label-redirect']['fr-fr'] = "Réorienter";
+
+		$text['label-key_event']['en-us'] = "Key Event";
+		$text['label-key_event']['es-cl'] = "Evento clave";
+		$text['label-key_event']['pt-pt'] = "Evento Key";
+		$text['label-key_event']['fr-fr'] = "Evénement clé";
+
+		$text['label-orbit']['en-us'] = "Park + Orbit";
+		$text['label-orbit']['es-cl'] = "Park + Órbita";
+		$text['label-orbit']['pt-pt'] = "Parque + Orbit";
+		$text['label-orbit']['fr-fr'] = "Parc + Orbit";
+
+		$text['label-p2t']['en-us'] = "Push to Talk";
+		$text['label-p2t']['es-cl'] = "Pulsar para hablar";
+		$text['label-p2t']['pt-pt'] = "Push to Talk";
+		$text['label-p2t']['fr-fr'] = "Push to Talk";
+
+		$text['label-multicast_page']['en-us'] = "Multicast Page";
+		$text['label-multicast_page']['es-cl'] = "Página Multicast";
+		$text['label-multicast_page']['pt-pt'] = "Página multicast";
+		$text['label-multicast_page']['fr-fr'] = "Cette page multicast";
+
+		$text['label-button']['en-us'] = "Button";
+		$text['label-button']['es-cl'] = "Botón";
+		$text['label-button']['pt-pt'] = "Botão";
+		$text['label-button']['fr-fr'] = "Bouton";
+
+		$text['label-ivr']['en-us'] = "IVR";
+		$text['label-ivr']['es-cl'] = "IVR";
+		$text['label-ivr']['pt-pt'] = "IVR";
+		$text['label-ivr']['fr-fr'] = "IVR";
+
 		$text['label-xml_browser']['en-us'] = "XML Browser";
 		$text['label-xml_browser']['es-cl'] = "Navegador XML";
 		$text['label-xml_browser']['pt-pt'] = "Navegador XML";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 0847ae8abe..bc5e8429c7 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -764,6 +764,34 @@ require_once "resources/require.php";
 					<?php
 					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
 				}
+				if (strtolower($device_vendor) == "snom" || strlen($device_vendor) == 0) {
+					if (strlen($device_vendor) == 0) { echo "<optgroup label='Snom'>"; }
+					?>
+					<option value='none' <?php if ($row['device_key_type'] == "none") { echo $selected;$found=true; } ?>><?php $text['label-none'] ?></option>
+					<option value='url' <?php if ($row['device_key_type'] == "url") { echo $selected;$found=true; } ?>><?php $text['label-action_url'] ?></option>
+					<option value='auto_answer' <?php if ($row['device_key_type'] == "auto_answer") { echo $selected;$found=true; } ?>><?php $text['label-auto_answer'] ?></option>
+					<option value='blf' <?php if ($row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php $text['label-blf'] ?></option>
+					<option value='button' <?php if ($row['device_key_type'] == "button") { echo $selected;$found=true; } ?>><?php $text['label-button'] ?></option>
+					<option value='call_agent' <?php if ($row['device_key_type'] == "call_agent") { echo $selected;$found=true; } ?>><?php $text['label-call_agent'] ?></option>
+					<option value='conference' <?php if ($row['device_key_type'] == "conference") { echo $selected;$found=true; } ?>><?php $text['label-conference'] ?></option>
+					<option value='dtmf' <?php if ($row['device_key_type'] == "dtmf") { echo $selected;$found=true; } ?>><?php $text['label-dtmf'] ?></option>
+					<option value='dest' <?php if ($row['device_key_type'] == "dest") { echo $selected;$found=true; } ?>><?php $text['label-extension'] ?></option>
+					<option value='redirect' <?php if ($row['device_key_type'] == "redirect") { echo $selected;$found=true; } ?>><?php $text['label-redirect'] ?></option>
+					<option value='icom' <?php if ($row['device_key_type'] == "icom") { echo $selected;$found=true; } ?>><?php $text['label-intercom'] ?></option>
+					<option value='ivr' <?php if ($row['device_key_type'] == "ivr") { echo $selected;$found=true; } ?>><?php $text['label-ivr'] ?></option>
+					<option value='keyevent' <?php if ($row['device_key_type'] == "keyevent") { echo $selected;$found=true; } ?>><?php $text['label-key_event'] ?></option>
+					<option value='line' <?php if ($row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php $text['label-line'] ?></option>
+					<option value='multicast' <?php if ($row['device_key_type'] == "multicast") { echo $selected;$found=true; } ?>><?php $text['label-multicast_page'] ?></option>
+					<option value='orbit' <?php if ($row['device_key_type'] == "orbit") { echo $selected;$found=true; } ?>><?php $text['label-orbit'] ?></option>
+					<option value='presence' <?php if ($row['device_key_type'] == "presence") { echo $selected;$found=true; } ?>><?php $text['label-presence'] ?></option>
+					<option value='p2t' <?php if ($row['device_key_type'] == "p2t") { echo $selected;$found=true; } ?>><?php $text['label-p2t'] ?></option>
+					<option value='mult' <?php if ($row['device_key_type'] == "mult") { echo $selected;$found=true; } ?>><?php $text['label-shared_line'] ?></option>
+					<option value='speed' <?php if ($row['device_key_type'] == "speed") { echo $selected;$found=true; } ?>><?php $text['label-speed_dial'] ?></option>
+					<option value='transfer' <?php if ($row['device_key_type'] == "transfer") { echo $selected;$found=true; } ?>><?php $text['label-transfer'] ?></option>
+					<option value='recorder' <?php if ($row['device_key_type'] == "recorder") { echo $selected;$found=true; } ?>><?php $text['label-record'] ?></option>
+					<?php
+					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
+				}
 				if (strtolower($device_vendor) == "yealink" || strlen($device_vendor) == 0) {
 					if (strlen($device_vendor) == 0) { echo "<optgroup label='Yealink'>"; }
 					?>