diff --git a/api/debug/checkTask.cfm b/api/debug/checkTask.cfm
new file mode 100644
index 0000000..43afad8
--- /dev/null
+++ b/api/debug/checkTask.cfm
@@ -0,0 +1,55 @@
+<cfsetting showdebugoutput="false">
+<cfsetting enablecfoutputonly="true">
+
+<cffunction name="apiAbort" access="public" returntype="void" output="true">
+  <cfargument name="payload" type="struct" required="true">
+  <cfcontent type="application/json; charset=utf-8">
+  <cfoutput>#serializeJSON(arguments.payload)#</cfoutput>
+  <cfabort>
+</cffunction>
+
+<cfset TaskID = val(url.TaskID ?: 0)>
+
+<cfif TaskID LTE 0>
+  <cfset apiAbort({ "OK": false, "ERROR": "missing_params", "MESSAGE": "TaskID required in URL" })>
+</cfif>
+
+<cftry>
+  <cfset qTask = queryExecute("
+    SELECT TaskID, TaskBusinessID, TaskCategoryID, TaskOrderID, TaskTypeID,
+           TaskClaimedByUserID, TaskClaimedOn, TaskCompletedOn,
+           TaskAddedOn, TaskSourceType, TaskSourceID
+    FROM Tasks
+    WHERE TaskID = ?
+  ", [ { value = TaskID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
+
+  <cfif qTask.recordCount EQ 0>
+    <cfset apiAbort({ "OK": false, "ERROR": "not_found", "MESSAGE": "Task not found" })>
+  </cfif>
+
+  <cfset apiAbort({
+    "OK": true,
+    "TASK": {
+      "TaskID": qTask.TaskID,
+      "TaskBusinessID": qTask.TaskBusinessID,
+      "TaskCategoryID": qTask.TaskCategoryID,
+      "TaskOrderID": qTask.TaskOrderID,
+      "TaskTypeID": qTask.TaskTypeID,
+      "TaskClaimedByUserID": qTask.TaskClaimedByUserID,
+      "TaskClaimedOn": qTask.TaskClaimedOn,
+      "TaskCompletedOn": qTask.TaskCompletedOn,
+      "TaskAddedOn": qTask.TaskAddedOn,
+      "TaskSourceType": qTask.TaskSourceType,
+      "TaskSourceID": qTask.TaskSourceID,
+      "IS_COMPLETED": NOT (isNull(qTask.TaskCompletedOn) OR len(trim(qTask.TaskCompletedOn)) EQ 0)
+    }
+  })>
+
+  <cfcatch>
+    <cfset apiAbort({
+      "OK": false,
+      "ERROR": "server_error",
+      "MESSAGE": cfcatch.message
+    })>
+  </cfcatch>
+</cftry>
diff --git a/api/tasks/accept.cfm b/api/tasks/accept.cfm
index c77c303..2cef886 100644
--- a/api/tasks/accept.cfm
+++ b/api/tasks/accept.cfm
@@ -62,16 +62,9 @@
     { value = TaskID, cfsqltype = "cf_sql_integer" }
   ], { datasource = "payfrit" })>
 
-  <!--- If task has an associated order, update order status to 4 (Claimed) --->
-  <cfif val(qTask.TaskOrderID) GT 0>
-    <cfset queryExecute("
-      UPDATE Orders
-      SET OrderStatusID = 4,
-          OrderLastEditedOn = NOW()
-      WHERE OrderID = ?
-        AND OrderStatusID = 3
-    ", [ { value = qTask.TaskOrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
-  </cfif>
+  <!--- NOTE: Do NOT update order status when accepting/claiming task --->
+  <!--- Order should remain at status 3 (Order complete, final prep) until task is completed --->
+  <!--- When task is completed, order status will be updated to 5 (Delivered) --->
 
   <cfset apiAbort({
     "OK": true,