diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 54f79bab19..71f6388c68 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -96,8 +96,9 @@ settings_urls = [
 # These javascript files are served "dynamically" - i.e. rendered on demand
 dynamic_javascript_urls = [
     url(r'^inventree.js', DynamicJsView.as_view(template_name='js/dynamic/inventree.js'), name='inventree.js'),
-    url(r'^settings.js', DynamicJsView.as_view(template_name='js/dynamic/settings.js'), name='settings.js'),
+    url(r'^calendar.js', DynamicJsView.as_view(template_name='js/dynamic/calendar.js'), name='calendar.js'),
     url(r'^nav.js', DynamicJsView.as_view(template_name='js/dynamic/nav.js'), name='nav.js'),
+    url(r'^settings.js', DynamicJsView.as_view(template_name='js/dynamic/settings.js'), name='settings.js'),
 ]
 
 # These javascript files are pased through the Django translation layer
@@ -107,7 +108,6 @@ translated_javascript_urls = [
     url(r'^barcode.js', DynamicJsView.as_view(template_name='js/translated/barcode.js'), name='barcode.js'),
     url(r'^bom.js', DynamicJsView.as_view(template_name='js/translated/bom.js'), name='bom.js'),
     url(r'^build.js', DynamicJsView.as_view(template_name='js/translated/build.js'), name='build.js'),
-    url(r'^calendar.js', DynamicJsView.as_view(template_name='js/translated/calendar.js'), name='calendar.js'),
     url(r'^company.js', DynamicJsView.as_view(template_name='js/translated/company.js'), name='company.js'),
     url(r'^filters.js', DynamicJsView.as_view(template_name='js/translated/filters.js'), name='filters.js'),
     url(r'^forms.js', DynamicJsView.as_view(template_name='js/translated/forms.js'), name='forms.js'),
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 22955e208b..6f0cbe4acd 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -147,6 +147,8 @@
 
 <!-- dynamic javascript templates -->
 <script type='text/javascript' src="{% url 'inventree.js' %}"></script>
+<script type='text/javascript' src="{% url 'calendar.js' %}"></script>
+<script type='text/javascript' src="{% url 'nav.js' %}"></script>
 <script type='text/javascript' src="{% url 'settings.js' %}"></script>
 
 <!-- translated javascript templates-->
@@ -155,12 +157,10 @@
 <script type='text/javascript' src="{% i18n_static 'barcode.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'bom.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'build.js' %}"></script>
-<script type='text/javascript' src="{% i18n_static 'calendar.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'company.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'filters.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'forms.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'label.js' %}"></script>
-<script type='text/javascript' src="{% i18n_static 'nav.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'modals.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'model_renderers.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'order.js' %}"></script>
diff --git a/InvenTree/templates/js/translated/calendar.js b/InvenTree/templates/js/dynamic/calendar.js
similarity index 100%
rename from InvenTree/templates/js/translated/calendar.js
rename to InvenTree/templates/js/dynamic/calendar.js
diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js
index 7091eb0577..86035c5c47 100644
--- a/InvenTree/templates/js/translated/order.js
+++ b/InvenTree/templates/js/translated/order.js
@@ -9,7 +9,7 @@ function createSalesOrder(options={}) {
         method: 'POST',
         fields: {
             reference: {
-                prefix: '{% settings_value "SALESORDER_REFERENCE_PREFIX" %}',
+                prefix: global_settings.SALESORDER_REFERENCE_PREFIX,
             },
             customer: {
                 value: options.customer,
@@ -40,7 +40,7 @@ function createPurchaseOrder(options={}) {
         method: 'POST',
         fields: {
             reference: {
-                prefix: "{% settings_value 'PURCHASEORDER_REFERENCE_PREFIX' %}",   
+                prefix: global_settings.PURCHASEORDER_REFERENCE_PREFIX,
             },
             supplier: {
                 value: options.supplier,
@@ -214,7 +214,7 @@ function loadPurchaseOrderTable(table, options) {
                 switchable: false,
                 formatter: function(value, row, index, field) {
 
-                    var prefix = "{% settings_value 'PURCHASEORDER_REFERENCE_PREFIX' %}";
+                    var prefix = global_settings.PURCHASEORDER_REFERENCE_PREFIX;
 
                     if (prefix) {
                         value = `${prefix}${value}`;
@@ -309,7 +309,7 @@ function loadSalesOrderTable(table, options) {
                 title: '{% trans "Sales Order" %}',
                 formatter: function(value, row, index, field) {
 
-                    var prefix = "{% settings_value 'SALESORDER_REFERENCE_PREFIX' %}";
+                    var prefix = global_settings.SALESORDER_REFERENCE_PREFIX;
 
                     if (prefix) {
                         value = `${prefix}${value}`;
@@ -423,7 +423,7 @@ function loadSalesOrderAllocationTable(table, options={}) {
                 switchable: false,
                 formatter: function(value, row) {
 
-                    var prefix = "{% settings_value 'SALESORDER_REFERENCE_PREFIX' %}";
+                    var prefix = global_settings.SALESORDER_REFERENCE_PREFIX;
 
                     var ref = `${prefix}${row.order_detail.reference}`;