diff --git a/web/src/flow/stages/prompt/PromptStage.ts b/web/src/flow/stages/prompt/PromptStage.ts
index b30135688344..c5d8aff3fb5b 100644
--- a/web/src/flow/stages/prompt/PromptStage.ts
+++ b/web/src/flow/stages/prompt/PromptStage.ts
@@ -116,6 +116,7 @@ ${prompt.initialValue}</textarea
                 return html`<input
                     type="email"
                     id=${fieldId}
+                    autocomplete="email"
                     name="${prompt.fieldKey}"
                     placeholder="${prompt.placeholder}"
                     class="pf-c-form-control"
@@ -243,9 +244,10 @@ ${prompt.initialValue}</textarea
     }
 
     renderPromptHelpText(prompt: StagePrompt) {
-        if (prompt.subText === "") {
+        if (!prompt.subText) {
             return nothing;
         }
+
         return html`<p class="pf-c-form__helper-text">${unsafeHTML(prompt.subText)}</p>`;
     }
 
diff --git a/web/src/user/user-settings/details/stages/prompt/PromptStage.ts b/web/src/user/user-settings/details/stages/prompt/PromptStage.ts
index 67a2992959c5..a25f0fd9c494 100644
--- a/web/src/user/user-settings/details/stages/prompt/PromptStage.ts
+++ b/web/src/user/user-settings/details/stages/prompt/PromptStage.ts
@@ -3,27 +3,31 @@ import "#flow/components/ak-flow-card";
 
 import { globalAK } from "#common/global";
 
+import { AKLabel } from "#components/ak-label";
+
 import { PromptStage } from "#flow/stages/prompt/PromptStage";
 
 import { PromptTypeEnum, StagePrompt } from "@goauthentik/api";
 
-import { msg, str } from "@lit/localize";
+import { msg } from "@lit/localize";
 import { html, nothing, TemplateResult } from "lit";
 import { customElement } from "lit/decorators.js";
 
 @customElement("ak-user-stage-prompt")
 export class UserSettingsPromptStage extends PromptStage {
     renderPromptInner(prompt: StagePrompt): TemplateResult {
-        return prompt.type === PromptTypeEnum.Checkbox
-            ? html`<input
-                  type="checkbox"
-                  class="pf-c-check__input"
-                  name="${prompt.fieldKey}"
-                  ?checked=${prompt.initialValue !== ""}
-                  ?required=${prompt.required}
-                  style="vertical-align: bottom"
-              />`
-            : super.renderPromptInner(prompt);
+        if (prompt.type === PromptTypeEnum.Checkbox) {
+            return html`<input
+                type="checkbox"
+                class="pf-c-check__input"
+                name=${prompt.fieldKey}
+                ?checked=${prompt.initialValue !== ""}
+                ?required=${prompt.required}
+                style="vertical-align: bottom"
+            />`;
+        }
+
+        return super.renderPromptInner(prompt);
     }
 
     renderField(prompt: StagePrompt): TemplateResult {
@@ -32,11 +36,20 @@ export class UserSettingsPromptStage extends PromptStage {
         if (this.shouldRenderInWrapper(prompt)) {
             return html`
                 <ak-form-element-horizontal
-                    label=${msg(str`${prompt.label}`)}
                     ?required=${prompt.required}
                     name=${prompt.fieldKey}
                     .errorMessages=${errors}
                 >
+                    <div slot="label" class="pf-c-form__group-label">
+                        ${AKLabel(
+                            {
+                                htmlFor: `field-${prompt.fieldKey}`,
+                                required: prompt.required,
+                            },
+                            prompt.label,
+                        )}
+                    </div>
+
                     ${this.renderPromptInner(prompt)} ${this.renderPromptHelpText(prompt)}
                 </ak-form-element-horizontal>
             `;