diff --git a/awx/ui/client/src/job-submission/job-submission.block.less b/awx/ui/client/src/job-submission/job-submission.block.less
index 5ddb90b628..e81b0d0941 100644
--- a/awx/ui/client/src/job-submission/job-submission.block.less
+++ b/awx/ui/client/src/job-submission/job-submission.block.less
@@ -243,6 +243,9 @@
     align-items: flex-start;
 }
 .JobSubmission-previewTagLabel {
+    color: @default-interface-txt;
+}
+.JobSubmission-previewTagLabel--deletable{
     color: @default-list-header-bg;
 }
 .JobSubmission-previewTagRevert {
diff --git a/awx/ui/client/src/job-submission/job-submission.controller.js b/awx/ui/client/src/job-submission/job-submission.controller.js
index b225a913fb..9fb0ece241 100644
--- a/awx/ui/client/src/job-submission/job-submission.controller.js
+++ b/awx/ui/client/src/job-submission/job-submission.controller.js
@@ -164,6 +164,7 @@ export default
                     $scope.has_default_inventory = data.defaults && data.defaults.inventory && data.defaults.inventory.id;
                     $scope.has_default_credential = data.defaults && data.defaults.credential && data.defaults.credential.id;
                     $scope.has_default_vault_credential = data.defaults && data.defaults.vault_credential && data.defaults.vault_credential.id;
+                    $scope.vault_password_required = ($scope.password_needed && data.passwords_needed_to_start.includes('vault_password'));
                     $scope.has_default_extra_credentials = data.defaults && data.defaults.extra_credentials && data.defaults.extra_credentials.length > 0;
 
                     $scope.other_prompt_data = {};
@@ -434,7 +435,7 @@ export default
                     }
                 }
                 else if($scope.step === "credential") {
-                    if($scope.selected_credentials.machine && $scope.forms.credentialpasswords && $scope.forms.credentialpasswords.$valid) {
+                    if(($scope.selected_credentials.machine || $scope.selected_credentials.vault) && $scope.forms.credentialpasswords && $scope.forms.credentialpasswords.$valid) {
                         return false;
                     }
                     else {
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 4cd78f99d1..109fa1d173 100644
--- a/awx/ui/client/src/job-submission/job-submission.partial.html
+++ b/awx/ui/client/src/job-submission/job-submission.partial.html
@@ -51,7 +51,7 @@
             <div ng-if="ask_credential_on_launch || password_needed" ng-show="step === 'credential'" class="JobSubmission-form">
                 <div class="JobSubmission-selectedItemContainer">
                     <div class="JobSubmission-selectedItem">
-                        <div class="JobSubmission-selectedItemInfo" ng-hide="!selected_credentials.machine && selected_credentials.extra.length === 0">
+                        <div class="JobSubmission-selectedItemInfo" ng-hide="!selected_credentials.machine && !selected_credentials.vault && selected_credentials.extra.length === 0">
                             <div class="JobSubmission-selectedItemLabel">
                                 <span translate>SELECTED:</span>
                             </div>
@@ -62,7 +62,8 @@
                                             <i class="fa fa-times JobSubmission-previewTagContainerTagDelete"></i>
                                         </div>
                                         <div class="JobSubmission-previewTag" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}">
-                                            <span><span class="JobSubmission-previewTagLabel">MACHINE</span>:&nbsp;{{selected_credentials.machine.name}}</span>
+                                            <span><span class="JobSubmission-previewTagLabel" ng-class="{'JobSubmission-previewTagLabel--deletable': ask_credential_on_launch}">
+                                                MACHINE</span>:&nbsp;{{selected_credentials.machine.name}}</span>
                                         </div>
                                     </div>
                                     <div class="JobSubmission-previewTagContainer" ng-repeat="extraCredential in selected_credentials.extra">
@@ -70,13 +71,14 @@
                                             <i class="fa fa-times JobSubmission-previewTagContainerTagDelete"></i>
                                         </div>
                                         <div class="JobSubmission-previewTag" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}">
-                                            <span><span class="JobSubmission-previewTagLabel">{{credential_types[extraCredential.credential_type].name | uppercase}}</span>:&nbsp;{{extraCredential.name}}</span>
+                                            <span><span class="JobSubmission-previewTagLabel" ng-class="{'JobSubmission-previewTagLabel--deletable': ask_credential_on_launch}">
+                                                {{credential_types[extraCredential.credential_type].name | uppercase}}</span>:&nbsp;{{extraCredential.name}}</span>
                                         </div>
                                     </div>
                                     <div class="JobSubmission-previewTagContainer JobSubmission-previewTagContainer--vault" ng-show="selected_credentials.vault">
                                         <div class="JobSubmission-previewTag JobSubmission-previewTag--vault" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}">
-                                            <span>
-                                                <span class="JobSubmission-previewTagLabel">VAULT</span>:&nbsp;{{selected_credentials.vault.name}}</span>
+                                            <span><span class="JobSubmission-previewTagLabel" ng-class="{'JobSubmission-previewTagLabel--deletable': ask_credential_on_launch}">
+                                                    VAULT</span>:&nbsp;{{selected_credentials.vault.name}}</span>
                                         </div>
                                     </div>
                                 </div>
@@ -340,7 +342,7 @@
                 <div class="JobSubmission-previewItem" ng-show="submitJobType === 'job_template'">
                     <div class="JobSubmission-previewItemTitle" translate>CREDENTIAL</div>
                     <div>
-                        <span ng-show="!selected_credentials.machine && selected_credentials.extra.length === 0" class="JobSubmission-selectedItemNone" translate>None selected</span>
+                        <span ng-show="!selected_credentials.machine && !selected_credentials.vault && selected_credentials.extra.length === 0" class="JobSubmission-selectedItemNone" translate>None selected</span>
                     </div>
                     <div>
                         <span ng-show="selected_credentials.machine" class="JobSubmission-previewItemSubTitle"><span translate>Machine</span>:&nbsp;</span>