diff --git a/awx/ui/static/js/controllers/Permissions.js b/awx/ui/static/js/controllers/Permissions.js
index e194a76c72..59024325fe 100644
--- a/awx/ui/static/js/controllers/Permissions.js
+++ b/awx/ui/static/js/controllers/Permissions.js
@@ -193,6 +193,10 @@ function PermissionsEdit ($scope, $rootScope, $compile, $location, $log, $routeP
            scope.category = 'Deploy';
            if (data['permission_type'] != 'run' && data['permission_type'] != 'check' ) {
               scope.category = 'Inventory';
+              scope.projectrequired = false;
+           }
+           else {
+              scope.projectrequired = true;
            }
            master['category'] = scope.category;
            
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index 2e726dd25f..6c37568092 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -457,8 +457,8 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
                  html += "</label>\n";
              }
              if ( (options.mode == 'add' && field.addRequired) || (options.mode == 'edit' && field.editRequired) ) {
-                html += "<span class=\"error\" ng-show=\"" + this.form.name + '_form.' + fld + ".$dirty && " + 
-                this.form.name + '_form.' + fld + ".$error.required\">A value is required!</span>\n";
+                html += "<p><span class=\"error\" ng-show=\"" + this.form.name + '_form.' + fld + ".$dirty && " + 
+                this.form.name + '_form.' + fld + ".$error.required\">A value is required!</span></p>\n";
              }
              html += "<p><span class=\"error api-error\" ng-bind=\"" + fld + "_api_error\"></span></p>\n";
              html += "</div>\n";