diff --git a/client/components/forms/CheckboxInput.vue b/client/components/forms/CheckboxInput.vue
index 9bbd60a4..37ddc615 100644
--- a/client/components/forms/CheckboxInput.vue
+++ b/client/components/forms/CheckboxInput.vue
@@ -15,6 +15,19 @@
         :theme="theme"
       />
       <div>
+        <slot
+          v-if="helpPosition === 'above_input'"
+          name="help"
+        >
+          <InputHelp
+            :help="help"
+            :help-classes="theme.default.help"
+          >
+            <template #after-help>
+              <slot name="bottom_after_help" />
+            </template>
+          </InputHelp>
+        </slot>
         <slot name="label">
           <label
             :aria-label="id ? id : name"
@@ -28,7 +41,10 @@
             >*</span>
           </label>
         </slot>
-        <slot name="help">
+        <slot
+          v-if="helpPosition === 'below_input'"
+          name="help"
+        >
           <InputHelp
             :help="help"
             :help-classes="theme.default.help"
diff --git a/client/components/forms/ToggleSwitchInput.vue b/client/components/forms/ToggleSwitchInput.vue
index 3dd52d8c..aa2cc4c3 100644
--- a/client/components/forms/ToggleSwitchInput.vue
+++ b/client/components/forms/ToggleSwitchInput.vue
@@ -16,6 +16,19 @@
       />
   
       <div>
+        <slot
+          v-if="helpPosition === 'above_input'"
+          name="help"
+        >
+          <InputHelp
+            :help="help"
+            :help-classes="theme.default.help"
+          >
+            <template #after-help>
+              <slot name="bottom_after_help" />
+            </template>
+          </InputHelp>
+        </slot>
         <slot name="label">
           <label
             :aria-label="id ? id : name"
@@ -29,7 +42,10 @@
             >*</span>
           </label>
         </slot>
-        <slot name="help">
+        <slot
+          v-if="helpPosition === 'below_input'"
+          name="help"
+        >
           <InputHelp
             :help="help"
             :help-classes="theme.default.help"