diff --git a/InvenTree/templates/js/forms.js b/InvenTree/templates/js/forms.js
index 3f0ae6fffb..cb505c2a11 100644
--- a/InvenTree/templates/js/forms.js
+++ b/InvenTree/templates/js/forms.js
@@ -304,8 +304,6 @@ function constructFormBody(fields, options) {
 
     var html = '';
 
-    html += `<div id='non-field-errors'><!-- Empty div for displaying errors --></div>`;
-
     // Client must provide set of fields to be displayed,
     // otherwise *all* fields will be displayed
     var displayed_fields = options.fields || fields;
@@ -684,7 +682,7 @@ function clearFormErrors(options) {
     // Remove the "has error" class
     $(options.modal).find('.has-error').removeClass('has-error');
 
-    // Clear the 'non field errors'
+    // Hide the 'non field errors'
     $(options.modal).find('#non-field-errors').html('');
 }
 
diff --git a/InvenTree/templates/js/modals.js b/InvenTree/templates/js/modals.js
index 180f3bed95..319158eaa0 100644
--- a/InvenTree/templates/js/modals.js
+++ b/InvenTree/templates/js/modals.js
@@ -19,18 +19,28 @@ function createNewModal(options={}) {
                     <button type="button" class="close" data-dismiss="modal" aria-label='{% trans "Close" %}'>
                         <span aria-hidden="true">&times;</span>
                     </button>
-                    <h3 id='modal-title'><i>Form Title Here</i></h3>
+                    <h3 id='modal-title'>
+                        <!-- Form title to be injected here -->
+                    </h3>
+                </div>
+                <div class='modal-form-content-wrapper'>
+                    <div id='pre-form-content'>
+                        <!-- Content can be inserted here *before* the form fields -->
                     </div>
-                    <div class='modal-form-content-wrapper'>
-                    <div class='alert alert-block alert-danger' id='form-validation-warning' style='display: none;'>
-                        {% trans "Form errors exist" %}
+                    <div id='non-field-errors'>
+                        <!-- Form error messages go here -->
                     </div>
-                    <div class='modal-form-content'>
+                    <div id='form-content' class='modal-form-content'>
                         <!-- Form content will be injected here-->
                     </div>
+                    <div id='post-form-content'>
+                        <!-- Content can be inserted here *after* the form fields -->
+                    </div>
                 </div>
                 <div class='modal-footer'>
-                    <div id='modal-footer-buttons'></div>
+                    <div id='modal-footer-buttons'>
+                        <!-- Extra buttons can be inserted here -->
+                    </div>
                     <button type='button' class='btn btn-default' id='modal-form-close' data-dismiss='modal'>{% trans "Cancel" %}</button>
                     <button type='button' class='btn btn-primary' id='modal-form-submit'>{% trans "Submit" %}</button>
                 </div>