diff --git a/InvenTree/templates/InvenTree/settings/setting.html b/InvenTree/templates/InvenTree/settings/setting.html
index e75c0b37d7..1d6c785b29 100644
--- a/InvenTree/templates/InvenTree/settings/setting.html
+++ b/InvenTree/templates/InvenTree/settings/setting.html
@@ -17,12 +17,12 @@
     <td>
         {% if setting.is_bool %}
         <div>
-            <input fieldname='{{ setting.key }}' id='setting-value-{{ setting.key }}' type='checkbox' disabled='' {% if setting.as_bool %}checked=''{% endif %}>
+            <input fieldname='{{ setting.key.upper }}' id='setting-value-{{ setting.key.upper }}' type='checkbox' disabled='' {% if setting.as_bool %}checked=''{% endif %}>
         </div>
         {% else %}
         <div id='setting-{{ setting.pk }}'>
             <b>
-            <span id='setting-value-{{ setting.key }}'>
+            <span id='setting-value-{{ setting.key.upper }}' fieldname='{{ setting.key.upper }}'>
                 {% if setting.value %}
                 {{ setting.value }}
                 {% else %}
@@ -38,7 +38,7 @@
     </td>
     <td>
         <div class='btn-group float-right'>
-            <button class='btn btn-default btn-glyph btn-edit-setting' pk='{{ setting.pk }}' setting='{{ key }}' title='{% trans "Edit setting" %}' {% if user_setting %}user='{{request.user.id}}'{% endif %}>
+            <button class='btn btn-default btn-glyph btn-edit-setting' pk='{{ setting.pk }}' setting='{{ setting.key.upper }}' title='{% trans "Edit setting" %}' {% if user_setting %}user='{{request.user.id}}'{% endif %}>
                 <span class='fas fa-edit icon-green'></span>
             </button>
         </div>
diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html
index b5953f0aba..ad6edf00b8 100644
--- a/InvenTree/templates/InvenTree/settings/settings.html
+++ b/InvenTree/templates/InvenTree/settings/settings.html
@@ -56,18 +56,11 @@ $('table').find('.btn-edit-setting').click(function() {
         {
             success: function(response) {
 
-                console.log(`setting ${pk} -> ${response.value}`);
-
                 if (response.is_bool) {
                     var enabled = response.value.toLowerCase() == 'true';
-
-                    console.log("bool result:", enabled);
-
                     $(`#setting-value-${setting}`).prop('checked', enabled);
                 } else {
                     $(`#setting-value-${setting}`).html(response.value);
-
-                    console.log("Normal result:", response.value);
                 }
             }
         }