diff --git a/services/web/frontend/stylesheets/components/forms.less b/services/web/frontend/stylesheets/components/forms.less
index 0b5f0834c6..001f46a52a 100755
--- a/services/web/frontend/stylesheets/components/forms.less
+++ b/services/web/frontend/stylesheets/components/forms.less
@@ -187,9 +187,18 @@ input[type='date'] {
 //
 // Designed to help with the organization and spacing of vertical forms. For
 // horizontal forms, use the predefined grid classes.
-
+@form-group-margin-bottom: 15px;
 .form-group {
-  margin-bottom: 15px;
+  margin-bottom: @form-group-margin-bottom;
+}
+
+// Form alert
+//
+// adds top padding/mergin so that element has spacing when scrolled into
+// view, but no vertical spacing is applied to layout
+.form-group#form-alert {
+  padding-top: @form-group-margin-bottom;
+  margin-top: -@form-group-margin-bottom;
 }
 
 // Checkboxes and radios
diff --git a/services/web/test/frontend/bootstrap.js b/services/web/test/frontend/bootstrap.js
index e3998e68d1..71925631cb 100644
--- a/services/web/test/frontend/bootstrap.js
+++ b/services/web/test/frontend/bootstrap.js
@@ -134,3 +134,5 @@ globalThis.fetch =
 // ignore CSS files
 const { addHook } = require('pirates')
 addHook(() => '', { exts: ['.css'], ignoreNodeModules: false })
+
+globalThis.HTMLElement.prototype.scrollIntoView = () => {}