diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 539e922e5f..aa36ff6c1a 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -353,7 +353,7 @@
 									$sql .= "set device_provisioned_date = :device_provisioned_date, device_provisioned_method = :device_provisioned_method, device_provisioned_ip = :device_provisioned_ip, device_provisioned_agent = :device_provisioned_agent ";
 									$sql .= "where domain_uuid = :domain_uuid ";
 									$sql .= "and device_address = :device_address  ";
-									$sql .= "and device_provisioned_date < NOW() - INTERVAL '30 seconds' ";
+									$sql .= "and (device_provisioned_date is null or device_provisioned_date < NOW() - INTERVAL '30 seconds') ";
 									$parameters['domain_uuid'] = $domain_uuid;
 									$parameters['device_address'] = strtolower($device_address);
 									$parameters['device_provisioned_date'] = 'now()';
@@ -738,7 +738,7 @@
 											$device_lines[$device_key_line]['line_keys'] = $row['device_key_value'];
 										}
 
-										//kept temporarily for backwards comptability to allow custom templates to be updated
+										//kept temporarily for backwards compatibility to allow custom templates to be updated
 										$device_keys[$id] = $row;
 										$device_keys[$id]['device_key_owner'] = "profile";
 									}