diff --git a/src/Controller/CAPI/RiderController.php b/src/Controller/CAPI/RiderController.php
index 1113fe54..7184e97e 100644
--- a/src/Controller/CAPI/RiderController.php
+++ b/src/Controller/CAPI/RiderController.php
@@ -20,6 +20,7 @@ use App\Entity\BatteryModel;
 use App\Entity\BatterySize;
 use App\Entity\RiderAPISession;
 use App\Entity\User;
+use Catalyst\APIBundle\Entity\User as APIUser;
 
 use App\Service\RedisClientProvider;
 use App\Service\RiderCache;
@@ -123,10 +124,18 @@ class RiderController extends APIController
                           RedisClientProvider $redis)
     {
         $required_params = [
-            'user',
-            'pass',
         ];
 
+        // TODO: right now, no validation at all. Accept anything.
+        // get capi user
+        $capi_user_id = $this->getUser()->getID();
+        $capi_user = $em->getRepository(APIUser::class)->find($capi_user_id);
+
+        // get rider id from capi user metadata
+        // TODO: uncomment once getMetadata is available
+        // $rider_id = $capi_user->getMetadata();
+
+        /*
         $missing = $this->checkMissingParameters($req, $required_params);
         if (count($missing) > 0)
         {
@@ -209,6 +218,12 @@ class RiderController extends APIController
         $data = [
             'hub' => $hub_data,
             'rider_id' => $rider_id,
+        ]; 
+        */
+
+        $data = [
+            'api_key' => $capi_user->getAPIKey(),
+            'secret_key' => $capi_user->getSecretKey(),
         ];
 
         return new APIResponse(true, 'Rider logged in.', $data);