diff --git a/awx/ui/static/js/forms/CustomInventory.js b/awx/ui/static/js/forms/CustomInventory.js
index 97b6413375..fbfb63b178 100644
--- a/awx/ui/static/js/forms/CustomInventory.js
+++ b/awx/ui/static/js/forms/CustomInventory.js
@@ -37,11 +37,13 @@ angular.module('CustomInventoryFormDefinition', [])
             organization: {
                 label: 'Organization',
                 type: 'lookup',
+                awRequiredWhen: {
+                    variable: "orgrequired",
+                    init: true
+                },
                 sourceModel: 'organization',
                 sourceField: 'name',
-                ngClick: 'lookUpOrganization()',
-                addRequired: false,
-                editRequired: false
+                ngClick: 'lookUpOrganization()'
             },
             script: {
                 label: 'Custom Script',