diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index 7eb68bed97..404a4dfdf3 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -349,6 +349,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_devices';
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'device_uuid';
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'device_key_category';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the type.';
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'device_key_id';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the key ID.';
@@ -366,4 +370,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the label.';
 		$z++;
 
-?>
+?>
\ No newline at end of file
diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index 5f5c04f2ef..6459ed3130 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -229,6 +229,12 @@
 		$text['description-device_key']['en-us'] = 'Select the key.';
 		$text['description-device_key']['pt-pt'] = '';
 
+		$text['label-device_key_category']['en-us'] = 'Category';
+		$text['label-device_key_category']['pt-pt'] = '';
+
+		$text['description-device_key_category']['en-us'] = 'Select the category.';
+		$text['description-device_key_category']['pt-pt'] = '';
+
 		$text['label-device_key_type']['en-us'] = 'Type';
 		$text['label-device_key_type']['pt-pt'] = '';
 
@@ -256,6 +262,15 @@
 		$text['label-park']['en-us'] = 'park';
 		$text['label-park']['pt-pt'] = '';
 
+		$text['label-programmable']['en-us'] = 'programmable';
+		$text['label-programmable']['pt-pt'] = '';
+
+		$text['label-memory']['en-us'] = 'memory';
+		$text['label-memory']['pt-pt'] = '';
+
+		$text['label-expansion']['en-us'] = 'expansion';
+		$text['label-expansion']['pt-pt'] = '';
+
 	//general translations
 		$text['label-true']['en-us'] = "true";
 		$text['label-true']['pt-pt'] = "sim";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index c1bbd0bdde..98a928d97d 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -555,6 +555,7 @@ require_once "resources/require.php";
 		echo "			<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "			<tr>\n";
 		echo "				<td class='vtable'>".$text['label-device_key_id']."</td>\n";
+		echo "				<td class='vtable'>".$text['label-device_key_category']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-device_key_type']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-device_key_value']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-device_key_label']."</td>\n";
@@ -593,23 +594,53 @@ require_once "resources/require.php";
 		}
 
 		echo "<tr>\n";
-		echo "			<td class='vtable' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "				<select class='formfld' style='width: 45px;' name='device_key_id'>\n";
-		echo "				<option value=''></option>\n";
-		echo "				<option value='1'>1</option>\n";
-		echo "				<option value='2'>2</option>\n";
-		echo "				<option value='3'>3</option>\n";
-		echo "				<option value='4'>4</option>\n";
-		echo "				<option value='5'>5</option>\n";
-		echo "				<option value='6'>6</option>\n";
-		echo "				<option value='7'>7</option>\n";
-		echo "				<option value='8'>8</option>\n";
-		echo "				<option value='9'>9</option>\n";
-		echo "				<option value='10'>10</option>\n";
-		echo "				<option value='11'>11</option>\n";
-		echo "				<option value='12'>12</option>\n";
-		echo "				</select>\n";
-		echo "			</td>\n";
+		echo "<td class='vtable' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	<select class='formfld' style='width: 45px;' name='device_key_id'>\n";
+		echo "	<option value=''></option>\n";
+		echo "	<option value='1'>1</option>\n";
+		echo "	<option value='2'>2</option>\n";
+		echo "	<option value='3'>3</option>\n";
+		echo "	<option value='4'>4</option>\n";
+		echo "	<option value='5'>5</option>\n";
+		echo "	<option value='6'>6</option>\n";
+		echo "	<option value='7'>7</option>\n";
+		echo "	<option value='8'>8</option>\n";
+		echo "	<option value='9'>9</option>\n";
+		echo "	<option value='10'>10</option>\n";
+		echo "	<option value='11'>11</option>\n";
+		echo "	<option value='12'>12</option>\n";
+		echo "	</select>\n";
+		echo "</td>\n";
+
+		echo "<td class='vtable' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	<select class='formfld' name='device_key_category'>\n";
+		echo "	<option value=''></option>\n";
+		if ($device_key_category == "line") { 
+			echo "	<option value='line' selected='selected'>".$text['label-line']."</option>\n";
+		}
+		else {
+			echo "	<option value='line'>".$text['label-line']."</option>\n";
+		}
+		if ($device_key_category == "memory") { 
+			echo "	<option value='memory' selected='selected'>".$text['label-memory']."</option>\n";
+		}
+		else {
+			echo "	<option value='memory'>".$text['label-memory']."</option>\n";
+		}
+		if ($device_key_category == "programmable") { 
+			echo "	<option value='programmable' selected='selected'>".$text['label-programmable']."</option>\n";
+		}
+		else {
+			echo "	<option value='programmable'>".$text['label-programmable']."</option>\n";
+		}
+		if ($device_key_category == "expansion") { 
+			echo "	<option value='expansion' selected='selected'>".$text['label-expansion']."</option>\n";
+		}
+		else {
+			echo "	<option value='expansion'>".$text['label-expansion']."</option>\n";
+		}
+		echo "	</select>\n";
+		echo "</td>\n";
 
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<input class='formfld' type='text' name='device_key_type' style='width: 120px;' maxlength='255' value=\"$device_key_type\">\n";
diff --git a/app/devices/device_key_edit.php b/app/devices/device_key_edit.php
index 3c88deab9d..4c6e5694c3 100644
--- a/app/devices/device_key_edit.php
+++ b/app/devices/device_key_edit.php
@@ -57,6 +57,7 @@ else {
 //get http post variables and set them to php variables
 	if (count($_POST)>0) {
 		$device_key_id = check_str($_POST["device_key_id"]);
+		$device_key_category = check_str($_POST["device_key_category"]);
 		$device_key_type = check_str($_POST["device_key_type"]);
 		$device_key_value = check_str($_POST["device_key_value"]);
 		$device_key_label = check_str($_POST["device_key_label"]);
@@ -71,6 +72,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//check for all required data
 		//if (strlen($device_key_id) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_id']."<br>\n"; }
+		//if (strlen($device_key_category) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_category']."<br>\n"; }
 		//if (strlen($device_key_type) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_type']."<br>\n"; }
 		//if (strlen($device_key_value) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_value']."<br>\n"; }
 		//if (strlen($device_key_label) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_label']."<br>\n"; }
@@ -97,6 +99,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "device_uuid, ";
 				$sql .= "device_key_id, ";
 				$sql .= "device_key_type, ";
+				$sql .= "device_key_type, ";
 				$sql .= "device_key_value, ";
 				$sql .= "device_key_label ";
 				$sql .= ")";
@@ -107,6 +110,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "'$device_uuid', ";
 				$sql .= "'$device_key_id', ";
 				$sql .= "'$device_key_type', ";
+				$sql .= "'$device_key_type', ";
 				$sql .= "'$device_key_value', ";
 				$sql .= "'$device_key_label' ";
 				$sql .= ")";
@@ -126,6 +130,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql = "update v_device_keys set ";
 				$sql .= "device_key_id = '$device_key_id', ";
 				$sql .= "device_key_type = '$device_key_type', ";
+				$sql .= "device_key_type = '$device_key_type', ";
 				$sql .= "device_key_value = '$device_key_value', ";
 				$sql .= "device_key_label = '$device_key_label' ";
 				$sql .= "where domain_uuid = '$domain_uuid' ";
@@ -156,6 +161,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		foreach ($result as &$row) {
 			$device_key_id = $row["device_key_id"];
 			$device_key_type = $row["device_key_type"];
+			$device_key_type = $row["device_key_type"];
 			$device_key_value = $row["device_key_value"];
 			$device_key_label = $row["device_key_label"];
 		}
@@ -180,6 +186,43 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='device_key_edit.php?id=$device_key_uuid'\" value='".$text['button-back']."'></td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-device_key_category'].":\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='device_key_category'>\n";
+	echo "	<option value=''></option>\n";
+	if ($device_key_category == "line") { 
+		echo "	<option value='line' selected='selected'>".$text['label-line']."</option>\n";
+	}
+	else {
+		echo "	<option value='line'>".$text['label-line']."</option>\n";
+	}
+	if ($device_key_category == "memory") { 
+		echo "	<option value='memory' selected='selected'>".$text['label-memory']."</option>\n";
+	}
+	else {
+		echo "	<option value='memory'>".$text['label-memory']."</option>\n";
+	}
+	if ($device_key_category == "programmable") { 
+		echo "	<option value='programmable' selected='selected'>".$text['label-programmable']."</option>\n";
+	}
+	else {
+		echo "	<option value='programmable'>".$text['label-programmable']."</option>\n";
+	}
+	if ($device_key_category == "expansion") { 
+		echo "	<option value='expansion' selected='selected'>".$text['label-expansion']."</option>\n";
+	}
+	else {
+		echo "	<option value='expansion'>".$text['label-expansion']."</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-device_key_category']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-device_key_id'].": \n";