diff --git a/app/device_imports/device_imports.php b/app/device_imports/device_imports.php
index e6b9cc332b..467089c005 100644
--- a/app/device_imports/device_imports.php
+++ b/app/device_imports/device_imports.php
@@ -179,8 +179,12 @@
 				foreach($schema as $row) {
 					echo "			<optgroup label='".$row['table']."'>\n";
 					foreach($row['fields'] as $field) {
-						if (substr($field, -5) != '_uuid') {
-							echo "    			<option value='".$row['table'].".$field'>$field</option>\n";
+						$selected = '';
+						if ($field == $line_field) {
+							$selected = "selected='selected'";
+						}
+						if ($field !== 'domain_uuid') {
+							echo "    			<option value='".$row['table'].".".$field."' ".$selected.">".$field."</option>\n";
 						}
 					}
 					echo "			</optgroup>\n";
@@ -436,4 +440,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>