diff --git a/awx/ui/client/lib/components/input/label.partial.html b/awx/ui/client/lib/components/input/label.partial.html
index c8d4802ffd..a01895e361 100644
--- a/awx/ui/client/lib/components/input/label.partial.html
+++ b/awx/ui/client/lib/components/input/label.partial.html
@@ -6,6 +6,7 @@
     <div ng-if="state._displayPromptOnLaunch" class="at-InputLabel-checkbox pull-right">
         <label class="at-InputLabel-checkboxLabel">
             <input type="checkbox"
+                   ng-disabled="state.asTag"
                    ng-model="state._promptOnLaunch"
                    ng-change="vm.togglePromptOnLaunch()" />
             <p>{{:: vm.strings.get('label.PROMPT_ON_LAUNCH') }}</p>
diff --git a/awx/ui/client/lib/components/input/secret.partial.html b/awx/ui/client/lib/components/input/secret.partial.html
index 3a0fc29c89..9518965cc7 100644
--- a/awx/ui/client/lib/components/input/secret.partial.html
+++ b/awx/ui/client/lib/components/input/secret.partial.html
@@ -27,7 +27,7 @@
                    ng-class="{ 'at-Input--rejected': state._rejected }"
                    ng-attr-maxlength="{{ state.max_length || undefined }}"
                    ng-attr-tabindex="{{ tab || undefined }}"
-                   ng-attr-placeholder="{{state._placeholder || undefined }}"
+                   ng-attr-placeholder="{{ state._promptOnLaunch ? '' : state._placeholder || undefined }}"
                    ng-change="vm.check()"
                    ng-disabled="state._disabled || form.disabled"
             />