diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index b60dae51e5..77830b329c 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -342,16 +342,6 @@ textarea.allowresize {
   }
 }
 
-.prepend-asterisk:before {
-  content: "\002A\00A0";
-  color: @red;
-  margin-right: -5px;
-}
-
-.prepend-asterisk.user-password:before {
-   margin-right: 0;
-}
-
 .subtitle {
   font-size: 16px;
 }
diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 76f8bd002c..4fb40e395d 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -700,6 +700,10 @@ input[type='radio']:checked:before {
     width: 30px;
 }
 
+.Form-requiredAsterisk {
+  color: @red;
+}
+
 @media only screen and (max-width: 650px) {
     .Form-formGroup {
         flex: 1 0 auto;
diff --git a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.controller.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.controller.js
index 6e346c5b4f..81ae0ff882 100644
--- a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.controller.js
+++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.controller.js
@@ -56,7 +56,7 @@
             $state.go('inventories.edit.groups.edit', {inventory_id: $scope.inventory_id, group_id: id});
         };
 
-        $scope.goToGroupGroups = function(id){console.log();
+        $scope.goToGroupGroups = function(id){
             $state.go('inventories.edit.groups.edit.nested_groups', {inventory_id: $scope.inventory_id, group_id: id});
         };
 
diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
index f7f1b581d5..0dbf97a0ba 100644
--- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
+++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
@@ -41,10 +41,7 @@ export default ['i18n', function(i18n) {
                 type: 'lookup',
                 list: 'OrganizationList',
                 basePath: 'organizations',
-                awRequiredWhen: {
-                    reqExpression: "orgrequired",
-                    init: true
-                },
+                required: true,
                 sourceModel: 'organization',
                 sourceField: 'name',
                 ngDisabled: '!(inventory_script_obj.summary_fields.user_capabilities.edit || canAdd)'
diff --git a/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js
index 06d6566168..850b043663 100644
--- a/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js
@@ -12,7 +12,7 @@ export default
                 .success(function (data) {
                     credentialTypesLookup()
                         .then(kinds => {
-                            if(data.credential_type === kinds.Machine && data.inputs){console.log(data.inputs);
+                            if(data.credential_type === kinds.Machine && data.inputs){
                                 if(data.inputs.password === "ASK" ){
                                     passwords.push("ssh_password");
                                 }
diff --git a/awx/ui/client/src/job-submission/job-submission-factories/prompt-for-passwords.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/prompt-for-passwords.factory.js
index 7efc827919..40557c58c3 100644
--- a/awx/ui/client/src/job-submission/job-submission-factories/prompt-for-passwords.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/prompt-for-passwords.factory.js
@@ -17,8 +17,11 @@ export default
                 field = form.fields[password];
                 fld = password;
                 scope[fld] = '';
-                html += "<div class=\"form-group prepend-asterisk\">\n";
-                html += "<label for=\"" + fld + "\">" + field.label + "</label>\n";
+                html += "<div class=\"form-group\">\n";
+                html += "<label for=\"" + fld + "\">";
+                html += '<span class="Form-requiredAsterisk">*</span>';
+                html += '<span>' + field.label + '</span>';
+                html += "</label>\n";
                 html += "<input type=\"password\" ";
                 html += "ng-model=\"" + fld + '" ';
                 html += 'name="' + fld + '" ';
@@ -37,8 +40,9 @@ export default
                     fld = field.associated;
                     field = form.fields[field.associated];
                     scope[fld] = '';
-                    html += "<div class=\"form-group prepend-asterisk\">\n";
+                    html += "<div class=\"form-group\">\n";
                     html += "<label for=\"" + fld + "\"> " + field.label + "</label>\n";
+                    html += '<span class="Form-requiredAsterisk">*</span>';
                     html += "<input type=\"password\" ";
                     html += "ng-model=\"" + fld + '" ';
                     html += 'name="' + fld + '" ';
diff --git a/awx/ui/client/src/job-submission/job-submission.partial.html b/awx/ui/client/src/job-submission/job-submission.partial.html
index 53d043060b..75f3951ae3 100644
--- a/awx/ui/client/src/job-submission/job-submission.partial.html
+++ b/awx/ui/client/src/job-submission/job-submission.partial.html
@@ -99,7 +99,8 @@
                         <div class="JobSubmission-instructions" translate>Launching this job requires the passwords listed below. Enter and confirm each password before continuing.</div>
                         <form name="forms.credentialpasswords" autocomplete="off" novalidate>
                             <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ssh_password_required">
-                                <label for="ssh_password" class="prepend-asterisk Form-inputLabelContainer">
+                                <label for="ssh_password" class="Form-inputLabelContainer">
+                                    <span class="Form-requiredAsterisk">*</span>
                                     <span class="Form-inputLabel" translate> Password</span>
                                 </label>
                                 <div class="input-group">
@@ -112,7 +113,8 @@
                                 <div class="error api-error" ng-bind="ssh_password_api_error"></div>
                             </div>
                             <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ssh_key_unlock_required">
-                                <label for="ssh_key_unlock" class="prepend-asterisk Form-inputLabelContainer">
+                                <label for="ssh_key_unlock" class="Form-inputLabelContainer">
+                                    <span class="Form-requiredAsterisk">*</span>
                                     <span class="Form-inputLabel" translate> Private Key Passphrase</span>
                                 </label>
                                 <div class="input-group">
@@ -125,7 +127,8 @@
                                 <div class="error api-error" ng-bind="ssh_key_unlock_api_error"></div>
                             </div>
                             <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="become_password_required">
-                                <label for="become_password" class="prepend-asterisk Form-inputLabelContainer">
+                                <label for="become_password" class="Form-inputLabelContainer">
+                                    <span class="Form-requiredAsterisk">*</span>
                                     <span class="Form-inputLabel" translate> Privilege Escalation Password</span>
                                 </label>
                                 <div class="input-group">
@@ -138,7 +141,8 @@
                                 <div class="error api-error" ng-bind="become_password_api_error"></div>
                             </div>
                             <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="vault_password_required">
-                                <label for="vault_password" class="prepend-asterisk Form-inputLabelContainer">
+                                <label for="vault_password" class="Form-inputLabelContainer">
+                                    <span class="Form-requiredAsterisk">*</span>
                                     <span class="Form-inputLabel" translate> Vault Password</span>
                                 </label>
                                 <div class="input-group">
@@ -174,7 +178,8 @@
                         </div>
                     </div>
                     <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ask_verbosity_on_launch">
-                        <label for="verbosity" class="prepend-asterisk Form-inputLabelContainer">
+                        <label for="verbosity" class="Form-inputLabelContainer">
+                            <span class="Form-requiredAsterisk">*</span>
                             <span class="Form-inputLabel" translate> Verbosity</span>
                         </label>
                         <div>
@@ -192,7 +197,8 @@
                         </div>
                     </div>
                     <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ask_job_type_on_launch">
-                        <label for="job_type" class="prepend-asterisk Form-inputLabelContainer">
+                        <label for="job_type" class="Form-inputLabelContainer">
+                            <span class="Form-requiredAsterisk">*</span>
                             <span class="Form-inputLabel" translate> Job Type</span>
                         </label>
                         <div>
@@ -269,7 +275,8 @@
             <div ng-if="survey_enabled" ng-show="step === 'survey'" class="JobSubmission-form">
                 <form name="forms.survey" autocomplete="off" novalidate>
                     <div ng-repeat="question in survey_questions" id="taker_'+question.index+'" class="form-group Form-formGroup Form-formGroup--singleColumn">
-                        <label ng-attr-for="{{question.variable}}" class="Form-inputLabelContainer" ng-class="{'prepend-asterisk': question.required===true}">
+                        <label ng-attr-for="{{question.variable}}" class="Form-inputLabelContainer">
+                            <span ng-show="question.required===true" class="Form-requiredAsterisk">*</span>
                             <span class="label-text Form-inputLabel"> {{question.question_name}}</span>
                         </label>
 
diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html
index f5d4eef445..7b8bfe3499 100644
--- a/awx/ui/client/src/license/license.partial.html
+++ b/awx/ui/client/src/license/license.partial.html
@@ -99,13 +99,18 @@
 				</div>
 
 				<form id="License-form" name="uploadlicense">
-					<div class="License-subTitleText prepend-asterisk"> <translate>License File</translate></div>
+					<div class="License-subTitleText">
+						<span class="Form-requiredAsterisk">*</span>
+						<translate>License File</translate>
+					</div>
 					<div class="input-group License-file--container">
 						<span class="btn btn-primary" ng-click="fakeClick()" ng-disabled="!user_is_superuser" translate>Browse</span>
                         <span class="License-fileName" ng-class="{'License-helperText' : fileName == 'No file selected.'}">{{fileName|translate}}</span>
 						<input id="License-file" class="form-control" type="file" file-on-change="getKey"/>
 					</div>
-					<div class="License-subTitleText prepend-asterisk"> <translate>End User License Agreement</translate>
+					<div class="License-subTitleText">
+						<span class="Form-requiredAsterisk">*</span>
+						<translate>End User License Agreement</translate>
 					</div>
 					<div id="eula_notice"
 						class="License-eulaNotice">{{ license.eula }}</div>
diff --git a/awx/ui/client/src/partials/survey-maker-modal.html b/awx/ui/client/src/partials/survey-maker-modal.html
index 41b9777138..5385a14b28 100644
--- a/awx/ui/client/src/partials/survey-maker-modal.html
+++ b/awx/ui/client/src/partials/survey-maker-modal.html
@@ -48,7 +48,8 @@
                             <dnd-nodrag>
                                 <div>
                                     <label class="SurveyMaker-previewLabel" for="question.variable">
-                                        <span class="label-text" ng-class="{'prepend-asterisk': question.required}"> {{question.question_name}}</span>
+                                        <span ng-show="question.required===true" class="Form-requiredAsterisk">*</span>
+                                        <span class="label-text"> {{question.question_name}}</span>
                                     </label>
                                 </div>
 
diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js
index fd1fbe7fbb..71684933d7 100644
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -421,43 +421,47 @@ function(ConfigurationUtils, i18n, $rootScope) {
     return {
         require: 'ngModel',
         compile: function(tElem) {
-            let label = $(tElem).closest('.form-group').find('label').first();
-            $(label).addClass('prepend-asterisk');
-        },
-        link: function(scope, elm, attrs, ctrl) {
+            return {
+                pre: function preLink() {
+                    let label = $(tElem).closest('.form-group').find('label').first();
+                    $(label).prepend('<span class="Form-requiredAsterisk">*</span>');
+                },
+                post: function postLink( scope, elm, attrs, ctrl ) {
+                    function updateRequired() {
+                        var isRequired = scope.$eval(attrs.awRequiredWhen);
 
-            function updateRequired() {
-                var isRequired = scope.$eval(attrs.awRequiredWhen);
+                        var viewValue = elm.val(),
+                            label, validity = true;
+                        label = $(elm).closest('.form-group').find('label').first();
 
-                var viewValue = elm.val(),
-                    label, validity = true;
-                label = $(elm).closest('.form-group').find('label').first();
+                        if (isRequired && (elm.attr('required') === null || elm.attr('required') === undefined)) {
+                            $(elm).attr('required', 'required');
+                            if(!$(label).find('span.Form-requiredAsterisk').length){
+                                $(label).prepend('<span class="Form-requiredAsterisk">*</span>');
+                            }
+                        } else if (!isRequired) {
+                            elm.removeAttr('required');
+                            if (!attrs.awrequiredAlwaysShowAsterisk) {
+                                $(label).find('span.Form-requiredAsterisk')[0].remove();
+                            }
+                        }
+                        if (isRequired && (viewValue === undefined || viewValue === null || viewValue === '')) {
+                            validity = false;
+                        }
+                        ctrl.$setValidity('required', validity);
+                    }
 
-                if (isRequired && (elm.attr('required') === null || elm.attr('required') === undefined)) {
-                    $(elm).attr('required', 'required');
-                    $(label).removeClass('prepend-asterisk').addClass('prepend-asterisk');
-                } else if (!isRequired) {
-                    elm.removeAttr('required');
-                    if (!attrs.awrequiredAlwaysShowAsterisk) {
-                        $(label).removeClass('prepend-asterisk');
+                    scope.$watchGroup([attrs.awRequiredWhen, $(elm).attr('name')], function() {
+                        // watch for the aw-required-when expression to change value
+                        updateRequired();
+                    });
+
+                    if (attrs.awrequiredInit !== undefined && attrs.awrequiredInit !== null) {
+                        // We already set a watcher on the attribute above so no need to call updateRequired() in here
+                        scope[attrs.awRequiredWhen] = attrs.awrequiredInit;
                     }
                 }
-                if (isRequired && (viewValue === undefined || viewValue === null || viewValue === '')) {
-                    validity = false;
-                }
-                ctrl.$setValidity('required', validity);
-            }
-
-            scope.$watchGroup([attrs.awRequiredWhen, $(elm).attr('name')], function() {
-                // watch for the aw-required-when expression to change value
-                updateRequired();
-            });
-
-            if (attrs.awrequiredInit !== undefined && attrs.awrequiredInit !== null) {
-                // We already set a watcher on the attribute above so no need to call updateRequired() in here
-                scope[attrs.awRequiredWhen] = attrs.awrequiredInit;
-            }
-
+            };
         }
     };
 })
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 3052788485..d548cffc13 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -633,15 +633,17 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                     if (field.label || field.labelBind) {
                         html += "<label class=\"";
                         html += (field.labelClass) ? field.labelClass : "";
-                        html += `${field.required ? ' prepend-asterisk ' : ''}`;
                         html += (horizontal) ? " " + getLabelWidth() : "Form-inputLabelContainer ";
                         html += (field.showParseTypeToggle) ? "Form-inputLabelContainer--codeMirror " : "";
                         html += "\" ";
                         html += (field.labelNGClass) ? "ng-class=\"" + field.labelNGClass + "\" " : "";
                         html += "for=\"" + fld + '">\n';
+
+                        html += `${field.required ? '<span class="Form-requiredAsterisk">*</span>' : ''}`;
+
                         html += (field.icon) ? Icon(field.icon) : "";
                         if (field.labelBind) {
-                            html += "\t\t<span ng-class=class=\"Form-inputLabel\" ng-bind=\"" + field.labelBind + "\" translate>\n\t\t</span>";
+                            html += "\t\t<span class=\"Form-inputLabel\" ng-bind=\"" + field.labelBind + "\" translate>\n\t\t</span>";
                         } else {
                             html += "\t\t<span class=\"Form-inputLabel\" translate>\n\t\t\t" + field.label + "\n\t\t</span>";
                         }
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 05c13310dc..720bad0aad 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -94,10 +94,7 @@ function(NotificationsList, CompletedJobsList, i18n) {
                     basePath: 'projects',
                     sourceModel: 'project',
                     sourceField: 'name',
-                    awRequiredWhen: {
-                        reqExpression: "projectrequired",
-                        init: "true"
-                    },
+                    required: true,
                     column: 1,
                     awPopOver: "<p>" + i18n._("Select the project containing the playbook you want this job to execute.") + "</p>",
                     dataTitle: i18n._('Project'),
@@ -111,10 +108,7 @@ function(NotificationsList, CompletedJobsList, i18n) {
                     ngOptions: 'book for book in playbook_options track by book',
                     ngDisabled: "!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate) || disablePlaybookBecausePermissionDenied",
                     id: 'playbook-select',
-                    awRequiredWhen: {
-                        reqExpression: "playbookrequired",
-                        init: "true"
-                    },
+                    required: true,
                     column: 1,
                     awPopOver: "<p>" + i18n._("Select the playbook to be executed by this job.") + "</p>",
                     dataTitle: i18n._('Playbook'),
diff --git a/awx/ui/client/src/users/add/users-add.controller.js b/awx/ui/client/src/users/add/users-add.controller.js
index d3e7abc3dd..0f425bb316 100644
--- a/awx/ui/client/src/users/add/users-add.controller.js
+++ b/awx/ui/client/src/users/add/users-add.controller.js
@@ -28,6 +28,7 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
             // apply form definition's default field values
             GenerateForm.applyDefaults(form, $scope);
 
+            $scope.isAddForm = true;
             $scope.ldap_user = false;
             $scope.not_ldap_user = !$scope.ldap_user;
             $scope.ldap_dn = null;
diff --git a/awx/ui/client/src/users/users.form.js b/awx/ui/client/src/users/users.form.js
index c9703a70a5..521a2cb75e 100644
--- a/awx/ui/client/src/users/users.form.js
+++ b/awx/ui/client/src/users/users.form.js
@@ -69,8 +69,10 @@ export default ['i18n', function(i18n) {
                     type: 'sensitive',
                     hasShowInputButton: true,
                     ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
-                    ngRequired: "$state.match('add')",
-                    labelNGClass: "{'prepend-asterisk user-password' : $state.matches('add')}",
+                    awRequiredWhen: {
+                        reqExpression: "isAddForm",
+                        init: false
+                    },
                     ngChange: "clearPWConfirm('password_confirm')",
                     autocomplete: false,
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
@@ -80,8 +82,10 @@ export default ['i18n', function(i18n) {
                     type: 'sensitive',
                     hasShowInputButton: true,
                     ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
-                    ngRequired: "$state.match('add')",
-                    labelNGClass: "{'prepend-asterisk user-password' : $state.matches('add')}",
+                    awRequiredWhen: {
+                        reqExpression: "isAddForm",
+                        init: false
+                    },
                     awPassMatch: true,
                     associated: 'password',
                     autocomplete: false,