diff --git a/src/Controller/CAPI/RiderController.php b/src/Controller/CAPI/RiderController.php
index b3ed71df..1113fe54 100644
--- a/src/Controller/CAPI/RiderController.php
+++ b/src/Controller/CAPI/RiderController.php
@@ -997,9 +997,6 @@ class RiderController extends APIController
 
         $rider->setAvailable(true);
 
-        // set rider's current job order to null
-        $rider->setCurrentJobOrder();
-
         $em->flush();
 
         $data = [];
diff --git a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
index 47d8728e..d3e3e4cc 100644
--- a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
+++ b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
@@ -123,7 +123,9 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface
 
         // get current user
         $user = $this->security->getUser();
-        if ($user != null)
+        // check if user is User or APIUser
+        //if ($user != null)
+        if ($user instanceof User)
         {
             $invoice->setCreatedBy($user);
         }