diff --git a/awx/ui/static/js/controllers/Teams.js b/awx/ui/static/js/controllers/Teams.js
index e66b579680..a20d92fc69 100644
--- a/awx/ui/static/js/controllers/Teams.js
+++ b/awx/ui/static/js/controllers/Teams.js
@@ -129,7 +129,7 @@ function TeamsAdd ($scope, $rootScope, $compile, $location, $log, $routeParams,
               })
           .error( function(data, status, headers, config) {
               ProcessErrors(scope, data, status, form,
-                            { hdr: 'Error!', msg: 'Failed to add new inventory. Post returned status: ' + status });
+                            { hdr: 'Error!', msg: 'Failed to add new team. Post returned status: ' + status });
               });
       };
 
diff --git a/awx/ui/static/js/forms/Teams.js b/awx/ui/static/js/forms/Teams.js
index 13b4b98e7f..bf9b619ffe 100644
--- a/awx/ui/static/js/forms/Teams.js
+++ b/awx/ui/static/js/forms/Teams.js
@@ -40,7 +40,8 @@ angular.module('TeamFormDefinition', [])
                 sourceField: 'name',
                 addRequired: true,
                 editRequired: true,
-                ngClick: 'lookUpOrganization()'
+                ngClick: 'lookUpOrganization()',
+                awRequiredWhen: {variable: "teamrequired", init: "true" }
                 }
             },
 
diff --git a/awx/ui/static/js/forms/Users.js b/awx/ui/static/js/forms/Users.js
index f391794a45..9d46ec649f 100644
--- a/awx/ui/static/js/forms/Users.js
+++ b/awx/ui/static/js/forms/Users.js
@@ -49,7 +49,8 @@ angular.module('UserFormDefinition', [])
                 addRequired: true,
                 editRequired: true,
                 ngClick: 'lookUpOrganization()',
-                excludeMode: 'edit'
+                excludeMode: 'edit',
+                awRequiredWhen: {variable: "orgrequired", init: "true" }
                 },
             username: {
                 label: 'Username',