diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html
index 4a8457d074..2781b26a30 100644
--- a/InvenTree/order/templates/order/sales_order_base.html
+++ b/InvenTree/order/templates/order/sales_order_base.html
@@ -167,8 +167,13 @@ src="{% static 'img/blank_image.png' %}"
     {% if order.shipment_date %}
     <tr>
         <td><span class='fas fa-truck'></span></td>
-        <td>{% trans "Shipped" %}</td>
-        <td>{{ order.shipment_date }}<span class='badge badge-right rounded-pill bg-dark'>{{ order.shipped_by }}</span></td>
+        <td>{% trans "Completed" %}</td>
+        <td>
+            {{ order.shipment_date }}
+            {% if order.shipped_by %}
+            <span class='badge badge-right rounded-pill bg-dark'>{{ order.shipped_by }}</span>
+            {% endif %}
+        </td>
     </tr>
     {% endif %}
     {% if order.responsible %}
diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js
index fdd8b60d28..def7e41358 100644
--- a/InvenTree/templates/js/translated/forms.js
+++ b/InvenTree/templates/js/translated/forms.js
@@ -730,6 +730,9 @@ function submitFormData(fields, options) {
         data = options.processBeforeUpload(data);
     }
 
+    // Show the progress spinner
+    $(options.modal).find('#modal-progress-spinner').show();
+
     // Submit data
     upload_func(
         options.url,
@@ -737,10 +740,13 @@ function submitFormData(fields, options) {
         {
             method: options.method,
             success: function(response) {
+                $(options.modal).find('#modal-progress-spinner').hide();
                 handleFormSuccess(response, options);
             },
             error: function(xhr) {
                 
+                $(options.modal).find('#modal-progress-spinner').hide();
+
                 switch (xhr.status) {
                 case 400:
                     handleFormErrors(xhr.responseJSON, fields, options);
diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js
index 4cd0be8cec..c01bb6c34a 100644
--- a/InvenTree/templates/js/translated/modals.js
+++ b/InvenTree/templates/js/translated/modals.js
@@ -72,6 +72,7 @@ function createNewModal(options={}) {
                         <!-- Extra buttons can be inserted here -->
                     </div>
                     <span class='flex-item' style='flex-grow: 1;'></span>
+                    <h4><span id='modal-progress-spinner' class='fas fa-circle-notch fa-spin' style='display: none;'></span></h4>
                     <button type='button' class='btn btn-secondary' id='modal-form-close' data-bs-dismiss='modal'>{% trans "Cancel" %}</button>
                     <button type='button' class='btn btn-primary' id='modal-form-submit'>{% trans "Submit" %}</button>
                 </div>