diff --git a/tests/e2e/test_flows_enroll.py b/tests/e2e/test_flows_enroll.py
index 226a34fad4..370e30d8b5 100644
--- a/tests/e2e/test_flows_enroll.py
+++ b/tests/e2e/test_flows_enroll.py
@@ -110,8 +110,8 @@ class TestFlowsEnroll(SeleniumTestCase):
         identification_stage = self.get_shadow_root("ak-stage-identification", flow_executor)
         wait = WebDriverWait(identification_stage, self.wait_timeout)
 
-        wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "a[name='enroll']")))
-        identification_stage.find_element(By.CSS_SELECTOR, "a[name='enroll']").click()
+        wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "a[ouiaId='enroll']")))
+        identification_stage.find_element(By.CSS_SELECTOR, "a[ouiaId='enroll']").click()
 
         # First prompt stage
         flow_executor = self.get_shadow_root("ak-flow-executor")
diff --git a/tests/e2e/test_flows_recovery.py b/tests/e2e/test_flows_recovery.py
index e0e068e50c..320eb55639 100644
--- a/tests/e2e/test_flows_recovery.py
+++ b/tests/e2e/test_flows_recovery.py
@@ -26,8 +26,8 @@ class TestFlowsRecovery(SeleniumTestCase):
         identification_stage = self.get_shadow_root("ak-stage-identification", flow_executor)
         wait = WebDriverWait(identification_stage, self.wait_timeout)
 
-        wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "a[name='recovery']")))
-        identification_stage.find_element(By.CSS_SELECTOR, "a[name='recovery']").click()
+        wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "a[ouiaId='recovery']")))
+        identification_stage.find_element(By.CSS_SELECTOR, "a[ouiaId='recovery']").click()
 
         # First prompt stage
         flow_executor = self.get_shadow_root("ak-flow-executor")
diff --git a/web/src/admin/admin-overview/AdminOverviewPage.ts b/web/src/admin/admin-overview/AdminOverviewPage.ts
index 5624e9172b..ed640f0f8a 100644
--- a/web/src/admin/admin-overview/AdminOverviewPage.ts
+++ b/web/src/admin/admin-overview/AdminOverviewPage.ts
@@ -8,7 +8,7 @@ import "#admin/admin-overview/cards/WorkerStatusCard";
 import "#admin/admin-overview/charts/AdminLoginAuthorizeChart";
 import "#admin/admin-overview/charts/OutpostStatusChart";
 import "#admin/admin-overview/charts/SyncStatusChart";
-import "#elements/cards/AggregatePromiseCard";
+import "#elements/cards/AggregateCard";
 import "#elements/cards/QuickActionsCard";
 
 import { formatUserDisplayName } from "#common/users";
diff --git a/web/src/admin/admin-overview/DashboardUserPage.ts b/web/src/admin/admin-overview/DashboardUserPage.ts
index cecaa265e0..7769d15e03 100644
--- a/web/src/admin/admin-overview/DashboardUserPage.ts
+++ b/web/src/admin/admin-overview/DashboardUserPage.ts
@@ -1,5 +1,5 @@
 import "#admin/admin-overview/charts/AdminModelPerDay";
-import "#elements/cards/AggregatePromiseCard";
+import "#elements/cards/AggregateCard";
 
 import { AKElement } from "#elements/Base";
 
diff --git a/web/src/elements/ak-dual-select/components/ak-dual-select-available-pane.ts b/web/src/elements/ak-dual-select/components/ak-dual-select-available-pane.ts
index 28d3e2979c..b0bddf8db5 100644
--- a/web/src/elements/ak-dual-select/components/ak-dual-select-available-pane.ts
+++ b/web/src/elements/ak-dual-select/components/ak-dual-select-available-pane.ts
@@ -49,7 +49,7 @@ export class AkDualSelectAvailablePane extends CustomEmitterElement<DualSelectEv
 
     /* The array of key/value pairs this pane is currently showing */
     @property({ type: Array })
-    public readonly options?: DualSelectPair[];
+    public options?: DualSelectPair[];
 
     /**
      * A set (set being easy for lookups) of keys with all the pairs selected,
@@ -57,7 +57,7 @@ export class AkDualSelectAvailablePane extends CustomEmitterElement<DualSelectEv
      * can be marked and their clicks ignored.
      */
     @property({ type: Object })
-    public readonly selected: Set<string | number> = new Set();
+    public selected: Set<string | number> = new Set();
 
     //#endregion
 
diff --git a/web/src/elements/ak-dual-select/components/ak-dual-select-selected-pane.ts b/web/src/elements/ak-dual-select/components/ak-dual-select-selected-pane.ts
index 1dbb7bd32b..ca06626d27 100644
--- a/web/src/elements/ak-dual-select/components/ak-dual-select-selected-pane.ts
+++ b/web/src/elements/ak-dual-select/components/ak-dual-select-selected-pane.ts
@@ -42,7 +42,7 @@ export class AkDualSelectSelectedPane extends CustomEmitterElement<DualSelectEve
 
     /* The array of key/value pairs that are in the selected list. ALL of them. */
     @property({ type: Array })
-    readonly selected: DualSelectPair[] = [];
+    public selected: DualSelectPair[] = [];
 
     //#endregion
 
diff --git a/web/src/elements/cards/stories/AggregatePromiseCard.stories.ts b/web/src/elements/cards/stories/AggregatePromiseCard.stories.ts
deleted file mode 100644
index 3172109165..0000000000
--- a/web/src/elements/cards/stories/AggregatePromiseCard.stories.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import "../AggregatePromiseCard.js";
-
-import { AggregatePromiseCard, type IAggregatePromiseCard } from "../AggregatePromiseCard.js";
-
-import { ifPresent } from "#elements/utils/attributes";
-
-import type { Meta, StoryObj } from "@storybook/web-components";
-
-import { html } from "lit";
-
-const metadata: Meta<AggregatePromiseCard> = {
-    title: "Elements/<ak-aggregate-card-promise>",
-    component: "ak-aggregate-card-promise",
-    tags: ["autodocs"],
-    parameters: {
-        docs: {
-            description: {
-                component: /* md */ `
-# Aggregate Promise Cards
-
-Aggregate Promise Cards are Aggregate Cards that take a promise from client code and either display
-the contents of that promise or a pre-configured failure notice. The contents must be compliant with
-and produce a meaningful result via the \`.toString()\` API. HTML in the string will currently be
-escaped.
-
-## Usage
-
-\`\`\`Typescript
-import "#elements/cards/AggregatePromiseCard";
-\`\`\`
-
-\`\`\`html
-<ak-aggregate-card-promise
-    header="Some title"
-    .promise="\${somePromise}"
-></ak-aggregate-card-promise>
-\`\`\`
-`,
-            },
-        },
-    },
-    argTypes: {
-        icon: { control: "text" },
-        label: { control: "text" },
-        headerLink: { control: "text" },
-        subtext: { control: "text" },
-        failureMessage: { control: "text" },
-    },
-};
-
-export default metadata;
-
-const text =
-    "Curl up and sleep on the freshly laundered towels mew, but make meme, make cute face growl at dogs in my sleep. Scratch me there, elevator butt humans, humans, humans oh how much they love us felines we are the center of attention they feed, they clean hopped up on catnip mice. Kitty time flop over, for see owner, run in terror";
-
-const MILLIS_PER_SECOND = 1000;
-const EXAMPLE_TIMEOUT = 8000; // 8 seconds
-
-export const DefaultStory: StoryObj = {
-    args: {
-        icon: undefined,
-        header: "Default",
-        headerLink: undefined,
-        subtext: `Demo has a ${EXAMPLE_TIMEOUT / MILLIS_PER_SECOND} second delay until resolution`,
-    },
-    render: ({ icon, label, headerLink, subtext }: IAggregatePromiseCard) => {
-        const runThis = (timeout: number, value: string) =>
-            new Promise((resolve) => setTimeout(resolve, timeout, value));
-
-        return html`>
-            <style>
-                ak-aggregate-card-promise {
-                    display: inline-block;
-                    width: 32rem;
-                    max-width: 32rem;
-                }
-            </style>
-            <ak-aggregate-card-promise
-                label=${ifPresent(label)}
-                headerLink=${ifPresent(headerLink)}
-                subtext=${ifPresent(subtext)}
-                icon=${ifPresent(icon)}
-                .promise=${runThis(EXAMPLE_TIMEOUT, text)}
-            >
-            </ak-aggregate-card-promise> `;
-    },
-};
-
-export const PromiseRejected: StoryObj = {
-    args: {
-        icon: undefined,
-        header: "Default",
-        headerLink: undefined,
-        subtext: `Demo has a ${EXAMPLE_TIMEOUT / MILLIS_PER_SECOND} second delay until resolution`,
-        failureMessage: undefined,
-    },
-    render: ({ icon, label, headerLink, subtext, failureMessage }: IAggregatePromiseCard) => {
-        const runThis = (timeout: number, value: string) =>
-            new Promise((_resolve, reject) => setTimeout(reject, timeout, value));
-
-        return html`
-            <style>
-                ak-aggregate-card-promise {
-                    display: inline-block;
-                    width: 32rem;
-                    max-width: 32rem;
-                }
-            </style>
-            <ak-aggregate-card-promise
-                label=${ifPresent(label)}
-                headerLink=${ifPresent(headerLink)}
-                subtext=${ifPresent(subtext)}
-                icon=${ifPresent(icon)}
-                failureMessage=${ifPresent(failureMessage)}
-                .promise=${runThis(EXAMPLE_TIMEOUT, text)}
-            >
-            </ak-aggregate-card-promise>
-        `;
-    },
-};
diff --git a/web/src/flow/stages/identification/IdentificationStage.ts b/web/src/flow/stages/identification/IdentificationStage.ts
index bc939406a3..9355d30748 100644
--- a/web/src/flow/stages/identification/IdentificationStage.ts
+++ b/web/src/flow/stages/identification/IdentificationStage.ts
@@ -365,13 +365,13 @@ export class IdentificationStage extends BaseStage<
         const enrollmentItem = enrollUrl
             ? html`<div class="pf-c-login__main-footer-band-item">
                   ${msg("Need an account?")}
-                  <a name="enroll" href="${enrollUrl}">${msg("Sign up.")}</a>
+                  <a href="${enrollUrl}" ouiaId="enroll">${msg("Sign up.")}</a>
               </div>`
             : null;
 
         const recoveryItem = recoveryUrl
             ? html`<div class="pf-c-login__main-footer-band-item">
-                  <a name="recovery" href="${recoveryUrl}"
+                  <a href="${recoveryUrl}" ouiaId="recovery"
                       >${msg("Forgot username or password?")}</a
                   >
               </div>`
@@ -450,7 +450,6 @@ export class IdentificationStage extends BaseStage<
                       <ak-flow-input-password
                           label=${msg("Password")}
                           input-id="ak-stage-identification-password"
-                          required
                           class="pf-c-form__group"
                           .errors=${this.challenge?.responseErrors?.password}
                           ?allow-show-password=${this.challenge.allowShowPassword}
@@ -510,9 +509,9 @@ export class IdentificationStage extends BaseStage<
                 ${this.renderInput()}
                 ${this.challenge?.passwordlessUrl
                     ? html`<a
-                          name="passwordless"
                           href=${this.challenge.passwordlessUrl}
                           class="pf-c-button pf-m-secondary pf-m-block"
+                          ouiaId="passwordless"
                       >
                           ${msg("Use a security key")}
                       </a> `
diff --git a/web/src/flow/stages/password/PasswordStage.ts b/web/src/flow/stages/password/PasswordStage.ts
index 18f55a42ea..d34f406e50 100644
--- a/web/src/flow/stages/password/PasswordStage.ts
+++ b/web/src/flow/stages/password/PasswordStage.ts
@@ -46,7 +46,6 @@ export class PasswordStage extends BaseStage<PasswordChallenge, PasswordChalleng
                 />
                 <ak-flow-input-password
                     label=${msg("Password")}
-                    required
                     grab-focus
                     class="pf-c-form__group"
                     .errors=${this.#errors("password")}
@@ -72,9 +71,7 @@ export class PasswordStage extends BaseStage<PasswordChallenge, PasswordChalleng
                   >
                       <legend class="sr-only">${msg("Additional actions")}</legend>
                       <div class="pf-c-login__main-footer-band-item">
-                          <a name="forgot-password" href="${this.challenge.recoveryUrl}"
-                              >${msg("Forgot password?")}</a
-                          >
+                          <a href="${this.challenge.recoveryUrl}">${msg("Forgot password?")}</a>
                       </div>
                   </fieldset>`
                 : null}