diff --git a/software/database/sqlite.php b/software/database/sqlite.php
index fcf0229..db65269 100644
--- a/software/database/sqlite.php
+++ b/software/database/sqlite.php
@@ -97,24 +97,35 @@ class DB implements DBIface {
         }
     }
 
-    public function updateDevice($id, $deviceData) {
-        $sql = "
-            UPDATE devices
-            SET id = :id,
-                mac_address = :mac_address,
-                ip_address = :ip_address,
-                ip_address_seen = :ip_address_seen,
-                firmware_version = :firmware_version,
-                temperature_offset = :temperature_offset,
-                humidity_offset = :humidity_offset,
-                last_seen = :last_seen
-            WHERE id = :id
-        ";
-        try {
-            $stmt = $this->pdo->prepare($sql);
-            $deviceData['id'] = $id;
-            $stmt->execute($deviceData);
-            return $stmt->rowCount();
+public function updateDevice($id, $deviceData) {
+    // Start building the SQL query
+    $sql = "UPDATE devices SET ";
+    
+    // Add the columns to be updated
+    $columns = [];
+    foreach ($deviceData as $column => $value) {
+        $columns[] = "$column = :$column";
+    }
+    $sql .= implode(", ", $columns);
+    
+    // Add the WHERE clause based on id
+    $sql .= " WHERE id = :id";
+
+    try {
+        // Prepare the statement
+        $stmt = $this->pdo->prepare($sql);
+
+        // Bind the parameters for the columns to be updated
+        foreach ($deviceData as $column => $value) {
+            $stmt->bindValue(":$column", $value);
+        }
+
+        // Bind the parameter for the id
+        $stmt->bindValue(":id", $id, PDO::PARAM_INT);
+
+        // Execute the statement
+        return $stmt->execute();
+
         } catch (PDOException $e) {
             die("Error updating device: " . $e->getMessage());
         }
diff --git a/software/device-api.php b/software/device-api.php
index 4c44e66..06d25d1 100644
--- a/software/device-api.php
+++ b/software/device-api.php
@@ -27,38 +27,18 @@ $router->post('/api/config', function($req) use($db) {
        !valid($msg,'ip_address',         '/^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$/i') ||
        !valid($msg,'firmware_version',   '/^[0-9]+$/') ||
        !valid($msg,'temperature_offset', '/^[0-9]+\.*[0-9]*$/') ||
-       !valid($msg,'humidity_offset',    '/^[0-9]+\.*[0-9]*$/')
+       !valid($msg,'humidity_offset',    '/^[0-9]+\.*[0-9]*$/') ||
+       !valid($msg,'id','/^[0-9]+$/')
     ) {
         echo '{"error_message": "Field verification failed."}';
         http_response_code(400);
         return;
     }
 
-    // If device is already registered (it sends an ID) then figure out what values changed and send those back for the device to re-configure itself.
-    else if(valid($msg,'id','/^[0-9]+$/')) {
-        $deviceData = $db->getDeviceByID($msg['id']);
-        // If device is not registered yet...
-        if($deviceData == null) {
-            echo '{"error_message": "Device by that ID not found."}';
-            http_response_code(400);
-            return;
-        }
-        // Return stored device data so device may update its settings.
-        echo json_encode($deviceData);
-        // Update database entry based on post data received.
-        $db->updateDevice([
-            'mac_address'        => $msg['mac_address'],
-            'ip_address'         => $msg['ip_address'],
-            'ip_address_seen'    => $_SERVER['REMOTE_ADDR'],
-            'firmware_version'   => $msg['firmware_version'],
-            'last_seen'          => date('Y-m-d H:i:s')
-        ]);
-        http_response_code(200);
-        return;
-    }
-
-    // All fields are set and no ID was given. Register new device and return new ID...
-    else {
+    $deviceData = $msg['id'] == 0 ?  null : $db->getDeviceByID($msg['id']);
+    // If device is not registered yet, register...
+    if($deviceData == null) {
+        // All fields are set and no ID was given. Register new device and return new ID...
         $config = [
             'mac_address'        => $msg['mac_address'],
             'ip_address'         => $msg['ip_address'],
@@ -69,9 +49,25 @@ $router->post('/api/config', function($req) use($db) {
             'last_seen'          => date('Y-m-d H:i:s')
         ];
         $deviceID = $db->addDevice($config);
-        echo json_encode(['deviceID' => $deviceID]);
+        $config['deviceID'] = $deviceID;
+        echo json_encode($config);
         http_response_code(200);
+        return;
     }
+    // If device is registered...
+    // Update database entry based on post data received.
+    $db->updateDevice($deviceData['id'],
+    [
+        'mac_address'        => $msg['mac_address'],
+        'ip_address'         => $msg['ip_address'],
+        'ip_address_seen'    => $_SERVER['REMOTE_ADDR'],
+        'firmware_version'   => $msg['firmware_version'],
+        'last_seen'          => date('Y-m-d H:i:s')
+    ]);
+    // Return stored device data so device may update its settings.
+    echo json_encode($deviceData);
+    http_response_code(200);
+    return;
 });
 
 // Device reports temperature back on this endpoint.