diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig
index 68642d19..52527c8e 100644
--- a/templates/customer/form.html.twig
+++ b/templates/customer/form.html.twig
@@ -32,7 +32,7 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ mode == 'update' ? url('customer_update_submit', {'id': obj.getId()}) : url('customer_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ mode == 'update' ? url('customer_update_submit', {'id': obj.getId()}) : url('customer_create_submit', {'ref':app.request.query.get('ref')|default('')}) }}">
 						<div class="m-portlet__body">
 							<div class="m-form__section m-form__section--first">
 								<div class="m-form__heading">
@@ -384,7 +384,11 @@
 						text: 'Your changes have been saved!',
 						type: 'success',
 						onClose: function() {
+                            {% if app.request.query.get('ref') == 'jo' %}
+							window.location.href = "{{ url('jo_in') }}";
+                            {% else %}
 							window.location.href = "{{ url('customer_list') }}";
+                            {% endif %}
 						}
 					});
 				}).fail(function(response) {
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 1a5e8df7..c064c56e 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -55,6 +55,12 @@
 											<select class="form-control m-select2" id="customer-vehicle" name="customer_vehicle"></select>
 											<div class="form-control-feedback hide" data-field="customer_vehicle"></div>
 										</div>
+                                        <div class="col-lg-6">
+                                            <label></label>
+                                            <div style="display:block; margin-top: 5px">
+                                            <a href="{{ url('customer_create', {'ref':'jo'}) }}" class="btn btn-success">Create New Customer / Vehicle</a>
+                                            </div>
+                                        </div>
 									</div>
 								</div>
 								<div class="m-form__section">