diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
index bbd0310a..9c9898f9 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
@@ -98,48 +98,6 @@
       </div>
     </div>
   {{/if}}
-
-  <div class="setting full field-mapper-setting">
-    <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.poster.label"}}</label>
-    </div>
-
-    <div class="setting-value">
-      {{wizard-mapper
-        inputs=this.action.poster
-        property="poster"
-        onUpdate=(action "mappedFieldUpdated")
-        options=(hash
-          textSelection="key,value"
-          wizardFieldSelection=true
-          userSelection="output"
-          outputDefaultSelection="user"
-          userLimit="1"
-          context="action"
-        )
-      }}
-    </div>
-  </div>
-
-  <div class="setting full field-mapper-setting">
-    <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.guest_email.label"}}</label>
-    </div>
-
-    <div class="setting-value">
-      {{wizard-mapper
-        inputs=this.action.guest_email
-        property="guest_email"
-        onUpdate=(action "mappedFieldUpdated")
-        options=(hash
-          textSelection="key,value"
-          wizardFieldSelection=true
-          outputPlaceholder="admin.wizard.action.guest_email.placeholder"
-          context="action"
-        )
-      }}
-    </div>
-  </div>
 {{/if}}
 
 {{#if publicTopicFields}}
@@ -962,6 +920,48 @@
 {{/if}}
 
 {{#if showPostAdvanced}}
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.poster.label"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=this.action.poster
+        property="poster"
+        onUpdate=(action "mappedFieldUpdated")
+        options=(hash
+          textSelection="key,value"
+          wizardFieldSelection=true
+          userSelection="output"
+          outputDefaultSelection="user"
+          userLimit="1"
+          context="action"
+        )
+      }}
+    </div>
+  </div>
+
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.guest_email.label"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=this.action.guest_email
+        property="guest_email"
+        onUpdate=(action "mappedFieldUpdated")
+        options=(hash
+          textSelection="key,value"
+          wizardFieldSelection=true
+          outputPlaceholder="admin.wizard.action.guest_email.placeholder"
+          context="action"
+        )
+      }}
+    </div>
+  </div>
+
   <div class="setting full">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.skip_redirect.label"}}</label>
diff --git a/test/javascripts/acceptance/admin-wizards-business-subscription-test.js b/test/javascripts/acceptance/admin-wizards-business-subscription-test.js
index e7c2f337..33bbbed9 100644
--- a/test/javascripts/acceptance/admin-wizards-business-subscription-test.js
+++ b/test/javascripts/acceptance/admin-wizards-business-subscription-test.js
@@ -221,7 +221,7 @@ acceptance("Admin | Custom Wizard Business Subscription", function (needs) {
       ".admin-wizard-container .wizard-custom-action .setting"
     );
     assert.ok(
-      listTopicSettings.length === 10,
+      listTopicSettings.length === 12,
       "Display all settings of create topic"
     );
     await actionTypeDropdown.expand();
diff --git a/test/javascripts/acceptance/admin-wizards-standard-subscription-test.js b/test/javascripts/acceptance/admin-wizards-standard-subscription-test.js
index 7cc05c5c..66aeac1a 100644
--- a/test/javascripts/acceptance/admin-wizards-standard-subscription-test.js
+++ b/test/javascripts/acceptance/admin-wizards-standard-subscription-test.js
@@ -215,7 +215,7 @@ acceptance("Admin | Custom Wizard Standard Subscription", function (needs) {
       ".admin-wizard-container .wizard-custom-action .setting"
     );
     assert.ok(
-      listTopicSettings.length === 10,
+      listTopicSettings.length === 12,
       "Display all settings of create topic"
     );
     await actionTypeDropdown.expand();
@@ -224,7 +224,7 @@ acceptance("Admin | Custom Wizard Standard Subscription", function (needs) {
       ".admin-wizard-container .wizard-custom-action .setting"
     );
     assert.ok(
-      listTopicSettings.length === 9,
+      listTopicSettings.length === 11,
       "Display all settings of send message"
     );
     await actionTypeDropdown.expand();
diff --git a/test/javascripts/acceptance/admin-wizards-unsubscribed-test.js b/test/javascripts/acceptance/admin-wizards-unsubscribed-test.js
index 55c456c7..b98b3e1c 100644
--- a/test/javascripts/acceptance/admin-wizards-unsubscribed-test.js
+++ b/test/javascripts/acceptance/admin-wizards-unsubscribed-test.js
@@ -396,7 +396,7 @@ acceptance("Admin | Custom Wizard Unsubscribed", function (needs) {
       ".admin-wizard-container .wizard-custom-action .setting"
     );
     assert.ok(
-      listTopicSettings.length === 10,
+      listTopicSettings.length === 12,
       "Display all settings of create topic"
     );
     await actionTypeDropdown.expand();