diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.directive.js b/awx/ui/client/src/access/addPermissions/addPermissions.directive.js
index a9d21dfff8..7e7ea5b30b 100644
--- a/awx/ui/client/src/access/addPermissions/addPermissions.directive.js
+++ b/awx/ui/client/src/access/addPermissions/addPermissions.directive.js
@@ -16,6 +16,8 @@ export default
                 controller: addPermissionsController,
                 templateUrl: templateUrl('access/addPermissions/addPermissions'),
                 link: function(scope, element, attrs, ctrl) {
+                    console.info(attrs);
+                    scope.withoutTeamPermissions = attrs.withoutTeamPermissions;
                     scope.toggleFormTabs('users');
 
                     $("body").addClass("is-modalOpen");
@@ -24,6 +26,7 @@ export default
 
                     Wait('start');
 
+
                     scope.$broadcast("linkLists");
 
                     setTimeout(function() {
diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.partial.html b/awx/ui/client/src/access/addPermissions/addPermissions.partial.html
index 85fd03d7f9..c2ca776768 100644
--- a/awx/ui/client/src/access/addPermissions/addPermissions.partial.html
+++ b/awx/ui/client/src/access/addPermissions/addPermissions.partial.html
@@ -23,10 +23,15 @@
                     <span class="AddPermissions-directionNumber">
                         1
                     </span>
-                    Please select Users / Teams from the lists below.
+                    <div ng-hide='withoutTeamPermissions'>
+                        Please select Users / Teams from the lists below.
+                    </div>
+                    <div ng-show='withoutTeamPermissions'>
+                        Please select Users from the list below.
+                    </div>
                 </div>
 
-                <div class="Form-tabHolder">
+                <div class="Form-tabHolder" ng-hide='withoutTeamPermissions'>
                     <div id="users_tab" class="Form-tab"
                         ng-click="toggleFormTabs('users')"
                         ng-class="{'is-selected': usersSelected }">
diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 1816888ce8..8300d7d09c 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -530,6 +530,9 @@ var tower = angular.module('Tower', [
             $rootScope.addPermission = function (scope) {
                 $compile("<add-permissions class='AddPermissions'></add-permissions>")(scope);
             };
+            $rootScope.addPermissionWithoutTeamTab = function (scope) {
+                $compile("<add-permissions class='AddPermissions' without-team-permissions='true'></add-permissions>")(scope);
+            };
 
             $rootScope.deletePermission = function (user, accessListEntry) {
                 let entry = accessListEntry;
diff --git a/awx/ui/client/src/forms/Teams.js b/awx/ui/client/src/forms/Teams.js
index b8e9ba4f65..ad07a0ab2b 100644
--- a/awx/ui/client/src/forms/Teams.js
+++ b/awx/ui/client/src/forms/Teams.js
@@ -71,7 +71,7 @@ export default
                     searchType: 'select',
                     actions: {
                         add: {
-                            ngClick: "addPermission",
+                            ngClick: "addPermissionWithoutTeamTab",
                             label: 'Add',
                             awToolTip: 'Add a permission',
                             actionClass: 'btn List-buttonSubmit',
@@ -92,13 +92,6 @@ export default
                             noSort: true,
                             class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
                             searchable: false
-                        },
-                        team_roles: {
-                            label: 'Team Roles',
-                            type: 'team_roles',
-                            noSort: true,
-                            class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4',
-                            searchable: false
                         }
                     }
                 },