diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php
index 8314c37594..8f42e00f6d 100644
--- a/app/devices/device_profile_edit.php
+++ b/app/devices/device_profile_edit.php
@@ -143,7 +143,6 @@
 							$x++;
 					}
 
-
 				//prepare the array
 					$array['device_profiles'][] = $_POST;
 
@@ -416,6 +415,9 @@
 			if (strlen($row['device_key_uuid']) > 0) {
 				echo "	<input name='device_keys[".$x."][device_key_uuid]' type='hidden' value=\"".escape($row['device_key_uuid'])."\">\n";
 			}
+			else {
+				echo "	<input name='device_keys[".$x."][device_key_uuid]' type='hidden' value=\"".uuid()."\">\n";
+			}
 		//show all the rows in the array
 			echo "<tr>\n";
 			echo "<td valign='top' align='left' nowrap='nowrap'>\n";