diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index b6c3ae35..61215796 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -237,6 +237,8 @@ class RAPIController extends Controller
         // assign rider to session
         $this->session->setRider($rider);
 
+        $rider->setAvailable(true);
+
         // TODO: log rider logging in
 
         $em->flush();
@@ -275,6 +277,10 @@ class RAPIController extends Controller
         if ($res->isError())
             return $res->getReturnResponse();
 
+        // make rider unavailable
+        $rider = $this->session->getRider();
+        $rider->setAvaialble(false);
+
         // remove rider from session
         $this->session->setRider(null);