diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 1aeb5359..053e72c1 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -23,9 +23,15 @@
-
- One-step Job Order
-
+ {% if mode == "onestep" %}
+
+ One-step Job Order
+
+ {% else %}
+
+ One-step Job Order #{{ obj.getID }} - {{ obj.getStatusText }}
+
+ {% endif %}
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index d1d69437..905e6f24 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -23,9 +23,15 @@
-
- Walk-in Job Order
-
+ {% if mode == "walk-in" %}
+
+ Walk-in Job Order
+
+ {% else %}
+
+ Walk-in Job Order #{{ obj.getID }} - {{ obj.getStatusText }}
+
+ {% endif %}