diff --git a/tests/wdio/scripts/check_local_chromedriver b/tests/wdio/scripts/check_local_chromedriver
index 8a1da9996..b1ddd73e8 100755
--- a/tests/wdio/scripts/check_local_chromedriver
+++ b/tests/wdio/scripts/check_local_chromedriver
@@ -20,7 +20,7 @@ fi;
 
 # The path to the working folder for the test project, as a subfolder of the monorepo. This will be
 # help us find where the driver is kept for comparison.
-SUBFOLDER="authentik-live-tests"
+SUBFOLDER="wdio"
 
 # The variant of Chrome we expect under Linux. There are a lot of variants, like Midori, chromium,
 # chromium-browser, etc. If you're not running the version supplied by Google, you'll have to change
diff --git a/tests/wdio/scripts/update_local_chromedriver b/tests/wdio/scripts/update_local_chromedriver
index 41d81a050..a13eaa827 100755
--- a/tests/wdio/scripts/update_local_chromedriver
+++ b/tests/wdio/scripts/update_local_chromedriver
@@ -30,7 +30,7 @@ fi;
 
 # The path to the working folder for the test project, as a subfolder of the monorepo. This will be
 # help us find where the driver is kept for comparison.
-SUBFOLDER="authentik-live-tests"
+SUBFOLDER="wdio"
 
 # The variant of Chrome we expect under Linux. There are a lot of variants, like Midori, chromium,
 # chromium-browser, etc. If you're not running the version supplied by Google, you'll have to change
diff --git a/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts b/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts
index 7b9aa4d3f..2349af45b 100644
--- a/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts
+++ b/web/src/admin/applications/wizard/methods/ldap/ak-application-wizard-authentication-by-ldap.ts
@@ -117,7 +117,6 @@ export class ApplicationWizardApplicationDetails extends BaseProviderPanel {
 
                     <ak-text-input
                         label=${msg("TLS Server name")}
-                        required
                         name="tlsServerName"
                         value="${first(provider?.tlsServerName, "")}"
                         help=${tlsServerNameHelp}
diff --git a/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-import.ts b/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-import.ts
index dda096a67..e7bd80e31 100644
--- a/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-import.ts
+++ b/web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-import.ts
@@ -6,16 +6,54 @@ import "@goauthentik/elements/forms/HorizontalFormElement";
 import { msg } from "@lit/localize";
 import { customElement } from "@lit/reactive-element/decorators/custom-element.js";
 import { html } from "lit";
+import { ifDefined } from "lit/directives/if-defined.js";
 
-import { FlowsInstancesListDesignationEnum } from "@goauthentik/api";
+import { FlowsInstancesListDesignationEnum, ProvidersSamlImportMetadataCreateRequest } from "@goauthentik/api";
 
 import BaseProviderPanel from "../BaseProviderPanel";
+import { query } from "lit/decorators.js";
+import { AkFileInput } from "@goauthentik/components/ak-file-input";
 
 @customElement("ak-application-wizard-authentication-by-saml-import")
 export class ApplicationWizardProviderSamlImport extends BaseProviderPanel {
+
+    @query('ak-file-input[name="metadata"]')
+    fileInput!: AkFileInput;
+
+    handleChange(ev: InputEvent) {
+        if (!ev.target) {
+            console.warn(`Received event with no target: ${ev}`);
+            return;
+        }
+        const target = ev.target as HTMLInputElement;
+        if (target.type === "file") {
+            const file = this.fileInput.files?.[0] ?? null;
+            if (file) {
+                this.dispatchWizardUpdate({
+                    update: {
+                        provider: {
+                            file
+                        },
+                    },
+                    status: this.form.checkValidity() ? "valid" : "invalid",
+                });
+            }
+            return;
+        }
+        super.handleChange(ev);
+    }
+
     render() {
+        const provider = this.wizard.provider as ProvidersSamlImportMetadataCreateRequest | undefined;
+
         return html` <form class="pf-c-form pf-m-horizontal" @input=${this.handleChange}>
-            <ak-text-input name="name" label=${msg("Name")} required></ak-text-input>
+            <ak-text-input
+                name="name"
+                value=${ifDefined(provider?.name)}
+                label=${msg("Name")}
+                required
+                help=${msg("Method's display Name.")}
+            ></ak-text-input>
 
             <ak-form-element-horizontal
                 label=${msg("Authorization flow")}
diff --git a/web/src/admin/applications/wizard/types.ts b/web/src/admin/applications/wizard/types.ts
index 696def61a..c1afacf53 100644
--- a/web/src/admin/applications/wizard/types.ts
+++ b/web/src/admin/applications/wizard/types.ts
@@ -6,11 +6,13 @@ import {
     RadiusProviderRequest,
     SAMLProviderRequest,
     SCIMProviderRequest,
+    ProvidersSamlImportMetadataCreateRequest,
 } from "@goauthentik/api";
 
 export type OneOfProvider =
     | Partial<SCIMProviderRequest>
     | Partial<SAMLProviderRequest>
+    | Partial<ProvidersSamlImportMetadataCreateRequest>
     | Partial<RadiusProviderRequest>
     | Partial<ProxyProviderRequest>
     | Partial<OAuth2ProviderRequest>
diff --git a/web/src/components/ak-file-input.ts b/web/src/components/ak-file-input.ts
index 96b748ce3..e4d81e013 100644
--- a/web/src/components/ak-file-input.ts
+++ b/web/src/components/ak-file-input.ts
@@ -2,7 +2,7 @@ import { AKElement } from "@goauthentik/elements/Base";
 
 import { msg } from "@lit/localize";
 import { html, nothing } from "lit";
-import { customElement, property } from "lit/decorators.js";
+import { customElement, property, query } from "lit/decorators.js";
 
 @customElement("ak-file-input")
 export class AkFileInput extends AKElement {
@@ -40,6 +40,13 @@ export class AkFileInput extends AKElement {
     @property({ type: String })
     help = "";
 
+    @query('input[type="file"]')
+    input!: HTMLInputElement;
+    
+    get files() {
+        return this.input.files;
+    }
+
     render() {
         const currentMsg =
             this.value && this.current