diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index c26391c710..c1bbd0bdde 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -548,177 +548,181 @@ require_once "resources/require.php";
 	echo "		</td>";
 	echo "	</tr>";
 
-	echo "	<tr>";
-	echo "		<td class='vncell' valign='top'>".$text['label-keys'].":</td>";
-	echo "		<td class='vtable' align='left'>";
-	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_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";
-	echo "				<td>&nbsp;</td>\n";
-	echo "			</tr>\n";
-	$sql = "SELECT * FROM v_device_keys ";
-	$sql .= "WHERE domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "AND device_uuid = '".$device_uuid."' ";
-	$sql .= "ORDER by device_key_id asc ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach($result as $row) {
+	if (permission_exists('device_key_add') || permission_exists('device_key_edit')) {
+		echo "	<tr>";
+		echo "		<td class='vncell' valign='top'>".$text['label-keys'].":</td>";
+		echo "		<td class='vtable' align='left'>";
+		echo "			<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "			<tr>\n";
-		echo "				<td class='vtable'>\n";
-		echo "					".$row['device_key_id']."&nbsp;\n";
-		echo "				</td>\n";
-		echo "				<td class='vtable'>\n";
-		echo "					".$row['device_key_type']."&nbsp;\n";
-		echo "				</td>\n";
-		echo "				<td class='vtable'>\n";
-		echo "					".$row['device_key_value']."&nbsp;\n";
-		echo "				</td>\n";
-		echo "				<td class='vtable'>\n";
-		echo "					".$row['device_key_label']."&nbsp;\n";
-		echo "				</td>\n";
-		echo "				<td>\n";
-		if (permission_exists('device_key_edit')) {
-			echo "					<a href='device_key_edit.php?device_uuid=".$row['device_uuid']."&id=".$row['device_key_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
-		}
-		if (permission_exists('device_key_delete')) {
-			echo "					<a href='device_key_delete.php?device_uuid=".$row['device_uuid']."&id=".$row['device_key_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
-		}
-		echo "				</td>\n";
+		echo "				<td class='vtable'>".$text['label-device_key_id']."</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";
+		echo "				<td>&nbsp;</td>\n";
 		echo "			</tr>\n";
+		$sql = "SELECT * FROM v_device_keys ";
+		$sql .= "WHERE domain_uuid = '".$_SESSION['domain_uuid']."' ";
+		$sql .= "AND device_uuid = '".$device_uuid."' ";
+		$sql .= "ORDER by device_key_id asc ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		foreach($result as $row) {
+			echo "			<tr>\n";
+			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_key_id']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_key_type']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_key_value']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_key_label']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td>\n";
+			if (permission_exists('device_key_edit')) {
+				echo "					<a href='device_key_edit.php?device_uuid=".$row['device_uuid']."&id=".$row['device_key_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
+			}
+			if (permission_exists('device_key_delete')) {
+				echo "					<a href='device_key_delete.php?device_uuid=".$row['device_uuid']."&id=".$row['device_key_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+			}
+			echo "				</td>\n";
+			echo "			</tr>\n";
+		}
+
+		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' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='device_key_type' style='width: 120px;' maxlength='255' value=\"$device_key_type\">\n";
+		echo "</td>\n";
+
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='device_key_value' style='width: 120px;' maxlength='255' value=\"$device_key_value\">\n";
+		echo "</td>\n";
+
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='device_key_label' style='width: 150px;' maxlength='255' value=\"$device_key_label\">\n";
+		echo "</td>\n";
+
+		echo "			<td class='vtable' align='left'>\n";
+		echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+		echo "			</td>\n";
+		echo "			</tr>\n";
+		echo "			</table>\n";
+		if (strlen($text['description-keys']) > 0) {
+			echo "			<br>".$text['description-keys']."\n";
+		}
+		echo "		</td>";
+		echo "	</tr>";
 	}
 
-	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' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='device_key_type' style='width: 120px;' maxlength='255' value=\"$device_key_type\">\n";
-	echo "</td>\n";
-
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='device_key_value' style='width: 120px;' maxlength='255' value=\"$device_key_value\">\n";
-	echo "</td>\n";
-
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='device_key_label' style='width: 150px;' maxlength='255' value=\"$device_key_label\">\n";
-	echo "</td>\n";
-
-	echo "			<td class='vtable' align='left'>\n";
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
-	echo "			</td>\n";
-	echo "			</tr>\n";
-	echo "			</table>\n";
-	if (strlen($text['description-settings']) > 0) {
-		echo "			<br>".$text['description-settings']."\n";
-	}
-	echo "		</td>";
-	echo "	</tr>";
-
-	echo "	<tr>";
-	echo "		<td class='vncell' valign='top'>".$text['label-settings'].":</td>";
-	echo "		<td class='vtable' align='left'>";
-	echo "			<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "			<tr>\n";
-	echo "				<td class='vtable'>".$text['label-device_setting_name']."</td>\n";
-	echo "				<td class='vtable'>".$text['label-device_setting_value']."</td>\n";
-	echo "				<td class='vtable'>".$text['label-enabled']."</td>\n";
-	echo "				<td class='vtable'>".$text['label-device_setting_description']."</td>\n";
-	echo "				<td>&nbsp;</td>\n";
-	echo "			</tr>\n";
-	$sql = "SELECT * FROM v_device_settings ";
-	$sql .= "WHERE domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "AND device_uuid = '".$device_uuid."' ";
-	$sql .= "ORDER by device_setting_subcategory asc ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	$result_count = count($result);
-	foreach($result as $row) {
-		//if (strlen($row['line_number']) == 0) { $row['line_number'] = "1"; }
+	if (permission_exists('device_setting_add')) {
+		echo "	<tr>";
+		echo "		<td class='vncell' valign='top'>".$text['label-settings'].":</td>";
+		echo "		<td class='vtable' align='left'>";
+		echo "			<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "			<tr>\n";
-		echo "				<td class='vtable'>\n";
-		echo "					".$row['device_setting_subcategory']."&nbsp;\n";
-		echo "				</td>\n";
-		echo "				<td class='vtable'>\n";
-		echo "					".$row['device_setting_value']."&nbsp;\n";
-		echo "				</td>\n";
-		echo "				<td class='vtable'>\n";
-		echo "					".$row['device_setting_enabled']."&nbsp;\n";
-		echo "				</td>\n";
-		echo "				<td class='vtable'>\n";
-		echo "					".$row['device_setting_description']."&nbsp;\n";
-		echo "				</td>\n";
-		echo "				<td>\n";
-		if (permission_exists('device_edit')) {
-			echo "					<a href='device_setting_edit.php?device_uuid=".$row['device_uuid']."&id=".$row['device_setting_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
-		}
-		if (permission_exists('device_delete')) {
-			echo "					<a href='device_setting_delete.php?device_uuid=".$row['device_uuid']."&id=".$row['device_setting_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
-		}
-		echo "				</td>\n";
+		echo "				<td class='vtable'>".$text['label-device_setting_name']."</td>\n";
+		echo "				<td class='vtable'>".$text['label-device_setting_value']."</td>\n";
+		echo "				<td class='vtable'>".$text['label-enabled']."</td>\n";
+		echo "				<td class='vtable'>".$text['label-device_setting_description']."</td>\n";
+		echo "				<td>&nbsp;</td>\n";
 		echo "			</tr>\n";
-	}
+		$sql = "SELECT * FROM v_device_settings ";
+		$sql .= "WHERE domain_uuid = '".$_SESSION['domain_uuid']."' ";
+		$sql .= "AND device_uuid = '".$device_uuid."' ";
+		$sql .= "ORDER by device_setting_subcategory asc ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		$result_count = count($result);
+		foreach($result as $row) {
+			//if (strlen($row['line_number']) == 0) { $row['line_number'] = "1"; }
+			echo "			<tr>\n";
+			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_setting_subcategory']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_setting_value']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_setting_enabled']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_setting_description']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td>\n";
+			if (permission_exists('device_edit')) {
+				echo "					<a href='device_setting_edit.php?device_uuid=".$row['device_uuid']."&id=".$row['device_setting_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
+			}
+			if (permission_exists('device_delete')) {
+				echo "					<a href='device_setting_delete.php?device_uuid=".$row['device_uuid']."&id=".$row['device_setting_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+			}
+			echo "				</td>\n";
+			echo "			</tr>\n";
+		}
 
-	echo "<tr>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='device_setting_subcategory' style='width: 120px;' maxlength='255' value=\"$device_setting_subcategory\">\n";
-	echo "</td>\n";
+		echo "<tr>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='device_setting_subcategory' style='width: 120px;' maxlength='255' value=\"$device_setting_subcategory\">\n";
+		echo "</td>\n";
 
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='device_setting_value' style='width: 120px;' maxlength='255' value=\"$device_setting_value\">\n";
-	echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='device_setting_value' style='width: 120px;' maxlength='255' value=\"$device_setting_value\">\n";
+		echo "</td>\n";
 
-	echo "<td class='vtable' align='left'>\n";
-	echo "    <select class='formfld' name='device_setting_enabled' style='width: 90px;'>\n";
-	echo "    <option value=''></option>\n";
-	if ($device_setting_enabled == "true") {
-		echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
-	}
-	else {
-		echo "    <option value='true'>".$text['label-true']."</option>\n";
-	}
-	if ($device_setting_enabled == "false") {
-		echo "    <option value='false' selected='selected'>".$text['label-false']."</option>\n";
-	}
-	else {
-		echo "    <option value='false'>".$text['label-false']."</option>\n";
-	}
-	echo "    </select>\n";
-	echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "    <select class='formfld' name='device_setting_enabled' style='width: 90px;'>\n";
+		echo "    <option value=''></option>\n";
+		if ($device_setting_enabled == "true") {
+			echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "    <option value='true'>".$text['label-true']."</option>\n";
+		}
+		if ($device_setting_enabled == "false") {
+			echo "    <option value='false' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "    <option value='false'>".$text['label-false']."</option>\n";
+		}
+		echo "    </select>\n";
+		echo "</td>\n";
 
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='device_setting_description' style='width: 150px;' maxlength='255' value=\"$device_setting_description\">\n";
-	echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='device_setting_description' style='width: 150px;' maxlength='255' value=\"$device_setting_description\">\n";
+		echo "</td>\n";
 
-	echo "			<td class='vtable' align='left'>\n";
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
-	echo "			</td>\n";
-	echo "			</tr>\n";
-	echo "			</table>\n";
-	if (strlen($text['description-settings']) > 0) {
-		echo "			<br>".$text['description-settings']."\n";
+		echo "			<td class='vtable' align='left'>\n";
+		echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+		echo "			</td>\n";
+		echo "			</tr>\n";
+		echo "			</table>\n";
+		if (strlen($text['description-settings']) > 0) {
+			echo "			<br>".$text['description-settings']."\n";
+		}
+		echo "		</td>";
+		echo "	</tr>";
 	}
-	echo "		</td>";
-	echo "	</tr>";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";