diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 40abd863f9..1617c26c26 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -678,14 +678,8 @@
 													$line_display_name = str_replace("\${description}", $description, $line_display_name);
 												}
 
-												//send a message to the user the device is not unique
-												if (!$device_unique) {
-													$message = $text['message-duplicate'].(if_group("superadmin") && $domain_name != $device_domain_name ? ": ".$device_domain_name : null);
-													message::add($message,'negative');
-												}
-
 												//build the devices array
-												if ($device_unique && $device_address != '000000000000') {
+												if (($device_unique && $device_mac_address != '000000000000') || $device_mac_address == '000000000000') {
 													$array["devices"][$j]["device_uuid"] = $device_uuids[$d];
 													$array["devices"][$j]["domain_uuid"] = $domain_uuid;
 													$array["devices"][$j]["device_address"] = $device_address;
@@ -716,7 +710,12 @@
 													if ($provision_line_register_expires !== null) $array["devices"][$j]["device_lines"][0]["register_expires"] = $provision_line_register_expires;
 													$array["devices"][$j]["device_lines"][0]["enabled"] = "true";
 												}
-
+												else {
+													//send a message to the user the device is not unique
+													$message = $text['message-duplicate'].(if_group("superadmin") && $_SESSION["domain_name"] != $device_domain_name ? ": ".$device_domain_name : null);
+													message::add($message,'negative');
+												}
+												
 												//increment
 												$j++;
 											}