diff --git a/templates/job-order/popup.html.twig b/templates/job-order/popup.html.twig
index 509c7296..d4e67d48 100644
--- a/templates/job-order/popup.html.twig
+++ b/templates/job-order/popup.html.twig
@@ -2,7 +2,12 @@
 {% set cv = jo.getCustomerVehicle %}
 <strong>{{ cust.getNameDisplay }}</strong><br>
 {{ cv.getPlateNumber }}<br>
-<a href="">Job Order #{{ jo.getID }}</a><br>
+<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
 {{ jo.getServiceTypeName }}<br>
 {{ jo.getStatusText }}
-
+{% if jo.getRider != null %}
+<br><br>
+{% set rider = jo.getRider %}
+{{ rider.getFullName }}<br>
+{{ rider.getPlateNumber }}
+{% endif %}
diff --git a/templates/rider/popup.html.twig b/templates/rider/popup.html.twig
index 8807d6c7..13b201d0 100644
--- a/templates/rider/popup.html.twig
+++ b/templates/rider/popup.html.twig
@@ -4,7 +4,7 @@
 {% set cust = jo.getCustomer %}
 {% set cv = jo.getCustomerVehicle %}
 <br>
-<a href="">Job Order #{{ jo.getID }}</a><br>
+<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
 {{ jo.getServiceTypeName }}<br>
 {{ jo.getStatusText }}<br><br>
 {{ cust.getNameDisplay }}<br>