diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index 8018d4cb..0d6bbf43 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -668,7 +668,7 @@ class RAPIController extends Controller
     {
         // allow rider to change service, promo, battery and trade-in options
         $em = $this->getDoctrine()->getManager();
-        $required_params = ['jo_id', 'stype_id', 'promo_id', 'batt_id', 'trade_in'];
+        $required_params = ['jo_id', 'stype_id', 'promo_id'];
         $res = $this->checkJO($req, $required_params, $jo);
         if ($res->isError())
             return $res->getReturnResponse();
@@ -698,10 +698,15 @@ class RAPIController extends Controller
             }
         }
 
+        // check or number
+        $or_num = $req->request->get('or_num');
+        if ($or_num != null)
+            $jo->setORNum($or_num);
+
         // check battery id
         $batt_id = $req->request->get('batt_id');
         // no battery
-        if ($batt_id == 0)
+        if ($batt_id == 0 || $batt_id == null)
             $battery = null;
         else
         {