diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 60d3cb56..697e379c 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -1291,7 +1291,10 @@ class APIController extends Controller
             switch ($status)
             {
                 case JOStatus::FULFILLED:
-                    $jo_data['date_fulfilled'] = $jo->getDateFulfill()->format('M d, Y');
+                    if ($jo->getDateFulfill() == null)
+                        $jo_data['date_fulfilled'] = '';
+                    else
+                        $jo_data['date_fulfilled'] = $jo->getDateFulfill()->format('M d, Y');
                     break;
                 case JOStatus::CANCELLED:
                     $jo_data['date_cancelled'] = $jo->getDateCancel()->format('M d, Y');
diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index ce5ec2c4..c515c345 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -1299,7 +1299,8 @@ class JobOrderController extends BaseController
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
                 ->setTier1Notes($req->request->get('tier1_notes'))
                 ->setTier2Notes($req->request->get('tier2_notes'))
-                ->setDeliveryAddress($req->request->get('delivery_address'));
+                ->setDeliveryAddress($req->request->get('delivery_address'))
+                ->setDateFulfill(new DateTime());
 
             // validate
             $errors = $validator->validate($obj);