diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index f9cbf472bc..51eae668f4 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -13,7 +13,8 @@
 
 <!-- Check permissions and owner -->
 {% setting_object 'STOCK_OWNER' as owner_enable %}
-{% if user.is_superuser or roles.stock.change and item.owner == user and owner_enable.value == "True" %}
+{% if owner_enable.value == "False" or owner_enable.value == "True" and item.owner == user %}
+{% if roles.stock.change and not item.is_building %}
 <div id='table-toolbar'>  
     <div class='btn-group'>
         <button class='btn btn-success' type='button' title='New tracking entry' id='new-entry'>
@@ -22,6 +23,7 @@
     </div>
 </div>
 {% endif %}
+{% endif %}
 <table class='table table-condensed table-striped' id='track-table' data-toolbar='#table-toolbar'>
 </table>
     
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 876f8605d9..c05a1c30df 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -114,57 +114,56 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
     <!-- Stock adjustment menu -->
     <!-- Check permissions and owner -->
     {% setting_object 'STOCK_OWNER' as owner_enable %}
-    {% if user.is_superuser or roles.stock.change and item.owner == user and owner_enable.value == "True" %}
-    {% if not item.is_building %}
-    <div class='btn-group'>
-        <button id='stock-options' title='{% trans "Stock adjustment actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
-        <ul class='dropdown-menu' role='menu'>
-            {% if item.in_stock %}
-            {% if not item.serialized %}
-            <li><a href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-clipboard-list'></span> {% trans "Count stock" %}</a></li>
-            <li><a href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
-            <li><a href='#' id='stock-remove' title='{% trans "Remove stock" %}'><span class='fas fa-minus-circle icon-red'></span> {% trans "Remove stock" %}</a></li>
-            {% endif %}
-            <li><a href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
-            {% if item.part.trackable and not item.serialized %}
-            <li><a href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
-            {% endif %}
-            {% endif %}
-            {% if item.part.salable and not item.customer %}
-            <li><a href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
-            {% endif %}
-            {% if item.customer %}
-            <li><a href='#' id='stock-return-from-customer' title='{% trans "Return to stock" %}'><span class='fas fa-undo'></span> {% trans "Return to stock" %}</a></li>
-            {% endif %}
-            {% if item.belongs_to %}
-            <li>
-                <a href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a>
-            </li>
-            {% endif %}
-        </ul>
-    </div>
-    {% endif %}
-    <!-- Edit stock item -->
-    {% if roles.stock.change and not item.is_building %}
-    <div class='btn-group'>
-        <button id='stock-edit-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-tools'></span> <span class='caret'></span></button>
-        <ul class='dropdown-menu' role='menu'>
-            {% if item.part.has_variants %}
-            <li><a href='#' id='stock-convert' title='{% trans "Convert to variant" %}'><span class='fas fa-screwdriver'></span> {% trans "Convert to variant" %}</a></li>
-            {% endif %}
-            {% if roles.stock.add %}
-            <li><a href='#' id='stock-duplicate' title='{% trans "Duplicate stock item" %}'><span class='fas fa-copy'></span> {% trans "Duplicate stock item" %}</a></li>
-            {% endif %}
-            <li><a href='#' id='stock-edit' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li>
-            {% if user.is_staff or roles.stock.delete %}
-                {% if item.can_delete %}
-                <li><a href='#' id='stock-delete' title='{% trans "Delete stock item" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete stock item" %}</a></li>
+    {% if owner_enable.value == "False" or owner_enable.value == "True" and item.owner == user %}
+        {% if roles.stock.change and not item.is_building %}
+        <div class='btn-group'>
+            <button id='stock-options' title='{% trans "Stock adjustment actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
+            <ul class='dropdown-menu' role='menu'>
+                {% if item.in_stock %}
+                {% if not item.serialized %}
+                <li><a href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-clipboard-list'></span> {% trans "Count stock" %}</a></li>
+                <li><a href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
+                <li><a href='#' id='stock-remove' title='{% trans "Remove stock" %}'><span class='fas fa-minus-circle icon-red'></span> {% trans "Remove stock" %}</a></li>
                 {% endif %}
-            {% endif %}
-        </ul>
-    </div>
-    {% endif %}
-    <!-- Check permissions and owner -->
+                <li><a href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
+                {% if item.part.trackable and not item.serialized %}
+                <li><a href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
+                {% endif %}
+                {% endif %}
+                {% if item.part.salable and not item.customer %}
+                <li><a href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
+                {% endif %}
+                {% if item.customer %}
+                <li><a href='#' id='stock-return-from-customer' title='{% trans "Return to stock" %}'><span class='fas fa-undo'></span> {% trans "Return to stock" %}</a></li>
+                {% endif %}
+                {% if item.belongs_to %}
+                <li>
+                    <a href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a>
+                </li>
+                {% endif %}
+            </ul>
+        </div>
+        {% endif %}
+        <!-- Edit stock item -->
+        {% if roles.stock.change and not item.is_building %}
+        <div class='btn-group'>
+            <button id='stock-edit-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-tools'></span> <span class='caret'></span></button>
+            <ul class='dropdown-menu' role='menu'>
+                {% if item.part.has_variants %}
+                <li><a href='#' id='stock-convert' title='{% trans "Convert to variant" %}'><span class='fas fa-screwdriver'></span> {% trans "Convert to variant" %}</a></li>
+                {% endif %}
+                {% if roles.stock.add %}
+                <li><a href='#' id='stock-duplicate' title='{% trans "Duplicate stock item" %}'><span class='fas fa-copy'></span> {% trans "Duplicate stock item" %}</a></li>
+                {% endif %}
+                <li><a href='#' id='stock-edit' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li>
+                {% if user.is_staff or roles.stock.delete %}
+                    {% if item.can_delete %}
+                    <li><a href='#' id='stock-delete' title='{% trans "Delete stock item" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete stock item" %}</a></li>
+                    {% endif %}
+                {% endif %}
+            </ul>
+        </div>
+        {% endif %}
     {% endif %}
     <button type='button' class='btn btn-default' id='stock-test-report' title='{% trans "Generate test report" %}'>
         <span class='fas fa-file-invoice'/>