diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73cb6fbb..8e8369da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## unreleased
  - OIDC protected and public paths now respect the site prefix when it is defined.
+ - Fix: forms without submit or reset buttons no longer keep extra bottom spacing.
  - add submit and reset form button icons: validate_icon, reset_icon, reset_color
 
 ## 0.42.0 (2026-01-17)
diff --git a/sqlpage/templates/form.handlebars b/sqlpage/templates/form.handlebars
index a7d4c4b1..a8851b86 100644
--- a/sqlpage/templates/form.handlebars
+++ b/sqlpage/templates/form.handlebars
@@ -9,7 +9,7 @@
     {{/if}}
     {{#if auto_submit}}data-auto-submit{{/if}}
 >
-    <fieldset class="form-fieldset mb-1">
+    <fieldset class="form-fieldset {{#if (or (and (ne validate '') (not auto_submit)) reset)}}mb-1{{else}}mb-0{{/if}}">
         {{#if title}}
             <h2 class="text-center mb-0">{{title}}</h2>
         {{/if}}