diff --git a/awx/api/views/root.py b/awx/api/views/root.py
index 96d86f9966..6a64ea8a77 100644
--- a/awx/api/views/root.py
+++ b/awx/api/views/root.py
@@ -234,7 +234,6 @@ class ApiV2AttachView(APIView):
     def post(self, request):
         data = request.data.copy()
         pool_id = data.get('pool_id', None)
-        # org = data.get('org', None)  # if we want allow to user to specify the org, we will need to pass this
         if not pool_id:
             return Response({"error": _("No subscription pool ID provided.")}, status=status.HTTP_400_BAD_REQUEST)
         user = getattr(settings, 'SUBSCRIPTIONS_USERNAME', None)
diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js
index c6c130114d..2cae41e363 100644
--- a/awx/ui/client/src/license/license.controller.js
+++ b/awx/ui/client/src/license/license.controller.js
@@ -72,11 +72,6 @@ export default
                 $scope.subscriptionCreds.password = subscriptionCreds.SUBSCRIPTIONS_PASSWORD;
                 $scope.showPlaceholderPassword = true;
             }
-
-            if (subscriptionCreds.ORGANIZATION_ID && subscriptionCreds.ORGANIZATION_ID !== "") {
-                $scope.subscriptionCreds.organization_id = subscriptionCreds.ORGANIZATION_ID;
-                $scope.showPlaceholderPassword = true;
-            }
         };
 
         const updateSubscriptionCreds = (config) => {
@@ -93,10 +88,6 @@ export default
                         $scope.subscriptionCreds.password = data.SUBSCRIPTIONS_PASSWORD;
                         $scope.showPlaceholderPassword = true;
                     }
-
-                    if (data.ENTITLEMENT_CONSUMER && data.ENTITLEMENT_CONSUMER.org && data.ENTITLEMENT_CONSUMER.org !== "") {
-                        $scope.subscriptionCreds.organization_id = data.ENTITLEMENT_CONSUMER.org;
-                    }
                 }).catch(() => {
                     initVars(config);
                 });
@@ -194,7 +185,6 @@ export default
                 payload.manifest = $scope.newLicense.manifest;
             } else if ($scope.selectedLicense.fullLicense) {
                 payload.pool_id = $scope.selectedLicense.fullLicense.pool_id;
-                payload.org = $scope.subscriptionCreds.organization_id;
                 attach = true;
             }
             
diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html
index b7f9f41942..00fc757c7b 100644
--- a/awx/ui/client/src/license/license.partial.html
+++ b/awx/ui/client/src/license/license.partial.html
@@ -140,10 +140,6 @@
 									<input id="rh-password" class="form-control Form-textInput" type="password" ng-model="subscriptionCreds.password" ng-disabled="!user_is_superuser || newLicense.file" />
 								</div>
 							</div>
-							<div class="License-rhCredField">
-								<label class="License-label d-block" translate>(OPTIONAL) ORGANIZATION LABEL</label>
-								<input class="form-control Form-textInput" type="text" ng-model="subscriptionCreds.organization_id" ng-disabled="!user_is_superuser || newLicense.file" />
-							</div>
 							<div class="License-getLicensesButton">
 								<span ng-click="lookupLicenses()" class="btn btn-primary" ng-disabled="!subscriptionCreds.username || !subscriptionCreds.password" translate>GET LICENSES</button>
 							</div>
diff --git a/awx/ui/client/src/license/license.route.js b/awx/ui/client/src/license/license.route.js
index fb2d869795..2ea594c12a 100644
--- a/awx/ui/client/src/license/license.route.js
+++ b/awx/ui/client/src/license/license.route.js
@@ -56,10 +56,6 @@ export default {
 								subscriptionCreds.SUBSCRIPTIONS_PASSWORD = data.SUBSCRIPTIONS_PASSWORD;
 						}
 
-						if (data.ENTITLEMENT_CONSUMER && data.ENTITLEMENT_CONSUMER.org && data.ENTITLEMENT_CONSUMER.org !== "") {
-							subscriptionCreds.ORGANIZATION_ID = data.ENTITLEMENT_CONSUMER.org;
-						}
-						
 						return subscriptionCreds;
 					}).catch(() => {
 							return {};