diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php
index c515709b..27d2888d 100644
--- a/src/Controller/CAPI/RiderAppController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -211,6 +211,9 @@ class RiderAppController extends APIController
         $rider_id = $rider->getID();
 
         $redis_client->set($redis_key, $rider_id);
+        */
+
+        $rider_id = $rider->getID();
 
         $hub = $rider->getHub();
         if ($hub == null)
@@ -232,13 +235,9 @@ class RiderAppController extends APIController
         $data = [
             'hub' => $hub_data,
             'rider_id' => $rider_id,
-        ]; 
-        */
-
-        $data = [
             'api_key' => $user->getAPIKey(),
             'secret_key' => $user->getSecretKey(),
-        ];
+        ]; 
 
         return new APIResponse(true, 'Rider logged in.', $data);
     }
@@ -254,7 +253,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -296,7 +295,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -415,7 +414,7 @@ class RiderAppController extends APIController
         $required_params = ['jo_id'];
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -464,7 +463,7 @@ class RiderAppController extends APIController
         $required_params = ['jo_id'];
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -519,7 +518,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -559,7 +558,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -599,7 +598,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -639,7 +638,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -674,7 +673,7 @@ class RiderAppController extends APIController
         $required_params = ['jo_id'];
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -734,7 +733,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -775,7 +774,7 @@ class RiderAppController extends APIController
         $required_params = ['jo_id'];
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -908,7 +907,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -949,7 +948,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -989,7 +988,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -1017,7 +1016,7 @@ class RiderAppController extends APIController
         }
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -1056,7 +1055,7 @@ class RiderAppController extends APIController
         }
  
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');
 
@@ -1115,7 +1114,7 @@ class RiderAppController extends APIController
         $required_params = ['jo_id', 'stype_id', 'promo_id'];
 
         // get capi user
-        $capi_user = $this->getCAPIUser($this->getUser()->getID(), $em);
+        $capi_user = $this->getUser();
         if ($capi_user == null)
             return new APIResponse(false, 'User not found.');