diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 585c0b3825..71e518560b 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -242,6 +242,14 @@
     border-color: var(--label-red);
 }
 
+.label-form {
+    margin: 2px;
+    padding: 3px;
+    padding-left: 10px;
+    padding-right: 10px;
+    border-radius: 5px;
+}
+
 .label-red {
     background: var(--label-red);
 }
diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index aed6f2bf14..41bfa596ed 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -648,14 +648,6 @@ class InvenTreeSetting(BaseInvenTreeSetting):
             'validator': bool,
         },
 
-        # TODO: Remove this setting in future, new API forms make this not useful
-        'PART_SHOW_QUANTITY_IN_FORMS': {
-            'name': _('Show Quantity in Forms'),
-            'description': _('Display available part quantity in some forms'),
-            'default': True,
-            'validator': bool,
-        },
-
         'PART_SHOW_IMPORT': {
             'name': _('Show Import in Views'),
             'description': _('Display the import wizard in some part views'),
@@ -970,6 +962,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
             'default': 10,
             'validator': [int, MinValueValidator(1)]
         },
+
+        'PART_SHOW_QUANTITY_IN_FORMS': {
+            'name': _('Show Quantity in Forms'),
+            'description': _('Display available part quantity in some forms'),
+            'default': True,
+            'validator': bool,
+        },
     }
 
     class Meta:
diff --git a/InvenTree/templates/InvenTree/settings/navbar.html b/InvenTree/templates/InvenTree/settings/navbar.html
index ebf24bffb1..095e616f5d 100644
--- a/InvenTree/templates/InvenTree/settings/navbar.html
+++ b/InvenTree/templates/InvenTree/settings/navbar.html
@@ -42,6 +42,12 @@
         </a>
     </li>
 
+    <li class='list-group-item' title='{% trans "Forms" %}'>
+        <a href='#' class='nav-toggle' id='select-user-forms'>
+            <span class='fas fa-table'></span>{% trans "Forms" %}
+        </a>
+    </li>
+
     <!--
         <li class='list-group-item' title='{% trans "Settings" %}'>
             <a href='#' class='nav-toggle' id='select-user-settings'>
diff --git a/InvenTree/templates/InvenTree/settings/part.html b/InvenTree/templates/InvenTree/settings/part.html
index 14a18a1aa5..837f59e997 100644
--- a/InvenTree/templates/InvenTree/settings/part.html
+++ b/InvenTree/templates/InvenTree/settings/part.html
@@ -17,7 +17,6 @@
         {% include "InvenTree/settings/setting.html" with key="PART_IPN_REGEX" %}
         {% include "InvenTree/settings/setting.html" with key="PART_ALLOW_DUPLICATE_IPN" %}
         {% include "InvenTree/settings/setting.html" with key="PART_ALLOW_EDIT_IPN" %}
-        {% include "InvenTree/settings/setting.html" with key="PART_SHOW_QUANTITY_IN_FORMS" icon="fa-hashtag" %}
         {% include "InvenTree/settings/setting.html" with key="PART_SHOW_PRICE_IN_FORMS" icon="fa-dollar-sign" %}
         {% include "InvenTree/settings/setting.html" with key="PART_SHOW_RELATED" icon="fa-random" %}
         {% include "InvenTree/settings/setting.html" with key="PART_CREATE_INITIAL" icon="fa-boxes" %}
diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html
index beb7f5eb04..50ed436fd6 100644
--- a/InvenTree/templates/InvenTree/settings/settings.html
+++ b/InvenTree/templates/InvenTree/settings/settings.html
@@ -20,6 +20,7 @@
 {% include "InvenTree/settings/user_search.html" %}
 {% include "InvenTree/settings/user_labels.html" %}
 {% include "InvenTree/settings/user_reports.html" %}
+{% include "InvenTree/settings/user_forms.html" %}
 
 {% if user.is_staff %}
 
diff --git a/InvenTree/templates/InvenTree/settings/user_forms.html b/InvenTree/templates/InvenTree/settings/user_forms.html
new file mode 100644
index 0000000000..121a0c7143
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/user_forms.html
@@ -0,0 +1,22 @@
+{% extends "panel.html" %}
+
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block label %}user-forms{% endblock %}
+
+{% block heading %}
+{% trans "Form Settings" %}
+{% endblock %}
+
+{% block content %}
+
+<div class='row'>
+    <table class='table table-striped table-condensed'>
+        <tbody>
+            {% include "InvenTree/settings/setting.html" with key="PART_SHOW_QUANTITY_IN_FORMS" icon="fa-hashtag" user_setting=True %}
+        </tbody>
+    </table>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/js/translated/model_renderers.js b/InvenTree/templates/js/translated/model_renderers.js
index 0c3dabc27e..6085aeb4df 100644
--- a/InvenTree/templates/js/translated/model_renderers.js
+++ b/InvenTree/templates/js/translated/model_renderers.js
@@ -159,7 +159,24 @@ function renderPart(name, data, parameters, options) {
         html += ` - <i>${data.description}</i>`;
     }
 
-    html += `<span class='float-right'><small>{% trans "Part ID" %}: ${data.pk}</small></span>`;
+    var stock = '';
+
+    // Display available part quantity
+    if (user_settings.PART_SHOW_QUANTITY_IN_FORMS) {
+        if (data.in_stock == 0) {
+            stock = `<span class='label-form label-red'>{% trans "No Stock" %}</span>`;
+        } else {
+            stock = `<span class='label-form label-green'>{% trans "In Stock" %}: ${data.in_stock}</span>`;
+        }
+    }
+
+    html += `
+    <span class='float-right'>
+        <small>
+            ${stock}
+            {% trans "Part ID" %}: ${data.pk}
+            </small>
+    </span>`;
 
     return html;
 }