diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index 9dbc81d171..b65907239a 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -117,6 +117,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'device_domain';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
 
 	//schema details
 		$y = 0; //table array index
diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index b84c521688..6f32fed9c2 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -774,6 +774,21 @@
 		$text['description-value']['pt-pt'] = "Introduza o valor desta definição.";
 		$text['description-value']['fr-fr'] = "Entrez la valeur de ce paramètre.";
 
+		$text['label-domain']['en-us'] = "Domain";
+		$text['label-domain']['es-cl'] = "Dominio";
+		$text['label-domain']['pt-pt'] = "Domínio";
+		$text['label-domain']['fr-fr'] = "Domaine";
+
+		$text['description-domain']['en-us'] = "";
+		$text['description-domain']['es-cl'] = "";
+		$text['description-domain']['pt-pt'] = "";
+		$text['description-domain']['fr-fr'] = "";
+
+		$text['select-global']['en-us'] = "Global";
+		$text['select-global']['es-cl'] = "Global";
+		$text['select-global']['pt-pt'] = "Global";
+		$text['select-global']['fr-fr'] = "Mondial";
+
 		$text['label-enabled']['en-us'] = "Enabled";
 		$text['label-enabled']['es-cl'] = "Habilitado";
 		$text['label-enabled']['pt-pt'] = "Habilitado";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index ad28152af8..59592e9de1 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -260,6 +260,8 @@ require_once "resources/require.php";
 		//$message = $orm->message;
 		foreach ($result as &$row) {
 			$device_mac_address = $row["device_mac_address"];
+			$domain_uuid = $row["domain_uuid"];
+			$device_label = $row["device_label"];
 			//$device_mac_address = substr($device_mac_address, 0,2).'-'.substr($device_mac_address, 2,2).'-'.substr($device_mac_address, 4,2).'-'.substr($device_mac_address, 6,2).'-'.substr($device_mac_address, 8,2).'-'.substr($device_mac_address, 10,2);
 			$device_label = $row["device_label"];
 			$device_vendor = $row["device_vendor"];
@@ -283,8 +285,7 @@ require_once "resources/require.php";
 
 //get device lines
 	$sql = "SELECT * FROM v_device_lines ";
-	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "and device_uuid = '".$device_uuid."' ";
+	$sql .= "where device_uuid = '".$device_uuid."' ";
 	$sql .= "order by line_number asc ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
@@ -299,8 +300,7 @@ require_once "resources/require.php";
 
 //get device keys
 	$sql = "SELECT * FROM v_device_keys ";
-	$sql .= "WHERE domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "AND device_uuid = '".$device_uuid."' ";
+	$sql .= "WHERE device_uuid = '".$device_uuid."' ";
 	$sql .= "ORDER by ";
 	$sql .= "CASE device_key_category ";
 	$sql .= "WHEN 'line' THEN 1 ";
@@ -322,8 +322,7 @@ require_once "resources/require.php";
 
 //get device settings
 	$sql = "SELECT * FROM v_device_settings ";
-	$sql .= "WHERE domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "AND device_uuid = '".$device_uuid."' ";
+	$sql .= "WHERE device_uuid = '".$device_uuid."' ";
 	$sql .= "ORDER by device_setting_subcategory asc ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
@@ -947,6 +946,34 @@ require_once "resources/require.php";
 	echo "</tr>\n";
 	*/
 
+	if (permission_exists('device_domain')) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-domain'].":\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "    <select class='formfld' name='domain_uuid'>\n";
+		if (strlen($domain_uuid) == 0) {
+			echo "    <option value='' selected='selected'>".$text['select-global']."</option>\n";
+		}
+		else {
+			echo "    <option value=''>".$text['select-global']."</option>\n";
+		}
+		foreach ($_SESSION['domains'] as $row) {
+			if ($row['domain_uuid'] == $domain_uuid) {
+				echo "    <option value='".$row['domain_uuid']."' selected='selected'>".$row['domain_name']."</option>\n";
+			}
+			else {
+				echo "    <option value='".$row['domain_uuid']."'>".$row['domain_name']."</option>\n";
+			}
+		}
+		echo "    </select>\n";
+		echo "<br />\n";
+		echo $text['description-domain_name']."\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_provision_enable'].":\n";
@@ -970,8 +997,6 @@ require_once "resources/require.php";
 	echo $text['description-device_provision_enable']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	echo "</td>\n";
-	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";