diff --git a/ui/app/components/recovery/page/snapshots.hbs b/ui/app/components/recovery/page/snapshots.hbs
index 751d44cc8c..8587cf27cd 100644
--- a/ui/app/components/recovery/page/snapshots.hbs
+++ b/ui/app/components/recovery/page/snapshots.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Page::Header @title="Secrets recovery" class="bottom-margin-16">
+<Page::Header @title="Secrets recovery">
   <:breadcrumbs>
     <Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
   </:breadcrumbs>
diff --git a/ui/app/components/recovery/page/snapshots/snapshot-details.hbs b/ui/app/components/recovery/page/snapshots/snapshot-details.hbs
index 8ab08d0ed5..a88c7d24dc 100644
--- a/ui/app/components/recovery/page/snapshots/snapshot-details.hbs
+++ b/ui/app/components/recovery/page/snapshots/snapshot-details.hbs
@@ -25,7 +25,7 @@
   </:actions>
 </Page::Header>
 
-<Hds::Table class="top-margin-16" data-test-table="details">
+<Hds::Table data-test-table="details">
   <:head as |H|>
     <H.Tr>
       {{#each this.tableColumns as |col|}}
diff --git a/ui/app/components/secret-engine/list.hbs b/ui/app/components/secret-engine/list.hbs
index 7ec23e98d5..db462f1ba3 100644
--- a/ui/app/components/secret-engine/list.hbs
+++ b/ui/app/components/secret-engine/list.hbs
@@ -37,7 +37,7 @@
 
 {{#if this.showContent}}
   {{! Filters section }}
-  <Hds::SegmentedGroup class="has-top-margin-m" as |SG|>
+  <Hds::SegmentedGroup class="top-margin-12" as |SG|>
     <SG.TextInput
       @width="300px"
       @type="search"
diff --git a/ui/app/styles/helper-classes/spacing.scss b/ui/app/styles/helper-classes/spacing.scss
index 152416b50f..37285ef582 100644
--- a/ui/app/styles/helper-classes/spacing.scss
+++ b/ui/app/styles/helper-classes/spacing.scss
@@ -171,6 +171,10 @@
   margin-bottom: size_variables.$spacing-8 !important;
 }
 
+.bottom-margin-8 {
+  margin-bottom: size_variables.$spacing-8;
+}
+
 .has-bottom-margin-s {
   margin-bottom: size_variables.$spacing-12;
 }
@@ -203,6 +207,10 @@
   margin-top: size_variables.$spacing-12;
 }
 
+.top-margin-12 {
+  margin-top: size_variables.$spacing-12;
+}
+
 .has-top-margin-xs {
   margin-top: size_variables.$spacing-8;
 }
diff --git a/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs b/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
index f023806a6d..ee51c7103b 100644
--- a/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
@@ -21,7 +21,7 @@
   </:description>
 </Page::Header>
 
-<div class="has-top-padding-l">
+<div>
   {{#if this.showForms}}
     <h3 class="is-size-4 has-text-weight-semibold">Settings</h3>
     <p class="has-border-top-light has-top-padding-l">
diff --git a/ui/lib/core/addon/components/page/header.hbs b/ui/lib/core/addon/components/page/header.hbs
index 2566e66687..3ccd23c13f 100644
--- a/ui/lib/core/addon/components/page/header.hbs
+++ b/ui/lib/core/addon/components/page/header.hbs
@@ -3,7 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Hds::PageHeader class="page-header" ...attributes as |PH|>
+<Hds::PageHeader class="page-header bottom-margin-8" ...attributes as |PH|>
   <PH.Title>{{@title}}</PH.Title>
   {{#if (has-block "breadcrumbs")}}
     <PH.Breadcrumb>
diff --git a/vault/core.go b/vault/core.go
index 2da158e6ae..719839c918 100644
--- a/vault/core.go
+++ b/vault/core.go
@@ -359,6 +359,10 @@ type Core struct {
 	keepHALockOnStepDown *uint32
 	heldHALock           physical.Lock
 
+	// enterpriseTokenGetAuthRegisterFunc is an optional per-core test seam for
+	// enterprise token auth registration lookup.
+	enterpriseTokenGetAuthRegisterFunc func(*Core) (RegisterAuthFunc, error)
+
 	// shutdownDoneCh is used to notify when core.Shutdown() completes.
 	// core.Shutdown() is typically issued in a goroutine to allow Vault to
 	// release the stateLock. This channel is marked atomic to prevent race