diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
index c658691690c..9eeea37fddf 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
@@ -186,29 +186,27 @@
           />
         </form.Container>
 
-        <form.Field
-          @name="auto_revoke"
-          @disabled={{this.readOnly}}
-          @showTitle={{false}}
-          @title={{i18n "admin.badges.auto_revoke_label"}}
-          as |field|
-        >
-          <field.Checkbox>
-            {{i18n "admin.badges.auto_revoke"}}
-          </field.Checkbox>
-        </form.Field>
+        <form.CheckboxGroup as |group|>
+          <group.Field
+            @name="auto_revoke"
+            @disabled={{this.readOnly}}
+            @showTitle={{false}}
+            @title={{i18n "admin.badges.auto_revoke"}}
+            as |field|
+          >
+            <field.Checkbox />
+          </group.Field>
 
-        <form.Field
-          @name="target_posts"
-          @disabled={{this.readOnly}}
-          @title={{i18n "admin.badges.target_posts_label"}}
-          @showTitle={{false}}
-          as |field|
-        >
-          <field.Checkbox>
-            {{i18n "admin.badges.target_posts"}}
-          </field.Checkbox>
-        </form.Field>
+          <group.Field
+            @name="target_posts"
+            @disabled={{this.readOnly}}
+            @title={{i18n "admin.badges.target_posts"}}
+            @showTitle={{false}}
+            as |field|
+          >
+            <field.Checkbox />
+          </group.Field>
+        </form.CheckboxGroup>
 
         <form.Field
           @name="trigger"