diff --git a/ui/app/components/auth-form.js b/ui/app/components/auth-form.js
index e09f7d73b..201bad6a0 100644
--- a/ui/app/components/auth-form.js
+++ b/ui/app/components/auth-form.js
@@ -66,10 +66,6 @@ export default Component.extend(DEFAULTS, {
       selectedAuth: newMethod,
       oldSelectedAuth: oldMethod,
     } = this;
-    // if we are cancelling the login then we reset the number challenge answer and cancel the current authenticate and polling tasks
-    if (cancelAuth) {
-      this.authenticate.cancelAll();
-    }
     next(() => {
       if (!token && (oldNS === null || oldNS !== ns)) {
         this.fetchMethods.perform();
diff --git a/ui/app/controllers/vault/cluster/auth.js b/ui/app/controllers/vault/cluster/auth.js
index d9b3b8d4c..5797478d1 100644
--- a/ui/app/controllers/vault/cluster/auth.js
+++ b/ui/app/controllers/vault/cluster/auth.js
@@ -88,8 +88,5 @@ export default Controller.extend({
         mfaErrors: null,
       });
     },
-    cancelAuthentication() {
-      this.set('cancelAuth', true);
-    },
   },
 });
diff --git a/ui/app/models/role-jwt.js b/ui/app/models/role-jwt.js
index 12652a7e6..1be9c486b 100644
--- a/ui/app/models/role-jwt.js
+++ b/ui/app/models/role-jwt.js
@@ -4,7 +4,6 @@
  */
 
 import Model, { attr } from '@ember-data/model';
-import parseURL from 'core/utils/parse-url';
 
 const DOMAIN_STRINGS = {
 };
@@ -17,13 +16,6 @@ export default class RoleJwtModel extends Model {
   @attr('string') authUrl;
 
   get providerName() {
-    const { hostname } = parseURL(this.authUrl);
-    const firstMatch = Object.keys(DOMAIN_STRINGS).find((name) => hostname.includes(name));
-    return DOMAIN_STRINGS[firstMatch] || null;
-  }
-
-  get providerButtonComponent() {
-    const { providerName } = this;
-    return PROVIDER_WITH_LOGO.includes(providerName) ? `auth-button-${providerName.toLowerCase()}` : null;
+    return null;
   }
 }
diff --git a/ui/app/templates/components/auth-jwt.hbs b/ui/app/templates/components/auth-jwt.hbs
index 2022b4622..ed20d2b90 100644
--- a/ui/app/templates/components/auth-jwt.hbs
+++ b/ui/app/templates/components/auth-jwt.hbs
@@ -54,12 +54,8 @@
     id="auth-submit"
   >
     {{#if this.isOIDC}}
-      {{#if this.role.providerButtonComponent}}
-        {{component this.role.providerButtonComponent}}
-      {{else}}
         Sign in with
         {{or this.role.providerName "OIDC Provider"}}
-      {{/if}}
     {{else}}
       Sign In
     {{/if}}
diff --git a/ui/app/templates/vault/cluster/auth.hbs b/ui/app/templates/vault/cluster/auth.hbs
index 30c8ce205..e01909e01 100644
--- a/ui/app/templates/vault/cluster/auth.hbs
+++ b/ui/app/templates/vault/cluster/auth.hbs
@@ -116,6 +116,15 @@
         @onSuccess={{action "onMfaSuccess"}}
         @onError={{fn (mut this.mfaErrors)}}
       />
+    {{else}}
+      <AuthForm
+        @wrappedToken={{this.wrappedToken}}
+        @cluster={{this.model}}
+        @namespace={{this.namespaceQueryParam}}
+        @redirectTo={{this.redirectTo}}
+        @selectedAuth={{this.authMethod}}
+        @onSuccess={{action "onAuthResponse"}}
+      />
     {{/if}}
   </Page.content>
   <Page.footer>