diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 43c2bab5..1c18d714 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -1108,10 +1108,12 @@ class APIController extends Controller
             case JOStatus::IN_PROGRESS:
                 $coord = $jo->getHub()->getCoordinates();
                 $rider = $jo->getRider();
-                // TODO: figure out cleaner way to generate urls
-                $image_url = 'http://resq.jankstudio.com/assets/images/user.gif';
+
+                // default image url
+                $url_prefix = $req->getSchemeAndHttpHost();
+                $image_url = $url_prefix . '/assets/images/user.gif';
                 if ($rider->getImageFile() != null)
-                    $image_url = 'http://resq.jankstudio.com/uploads/' . $rider->getImageFile();
+                    $image_url = $url_prefix . '/uploads/' . $rider->getImageFile();
                 $res->setData([
                     'status' => APIRiderStatus::RIDER_PICK_UP,
                     'jo_id' => $jo->getID(),