diff --git a/src/__tests__/pages/api/auth/[...nextauth].test.js b/src/__tests__/pages/api/auth/[...nextauth].test.js
index 6c1f9d6d9..2a510d514 100644
--- a/src/__tests__/pages/api/auth/[...nextauth].test.js
+++ b/src/__tests__/pages/api/auth/[...nextauth].test.js
@@ -54,8 +54,8 @@ describe("pages/api/auth/[...nextauth]", () => {
     const mod = await import("pages/api/auth/[...nextauth]");
     const [provider] = mod.default.options.providers;
 
-    expect(provider.id).toBe("homepage-password");
-    expect(provider.name).toBe("Password");
+    expect(provider.id).toBe("credentials");
+    expect(provider.name).toBe("Credentials");
     expect(provider.type).toBe("credentials");
     expect(typeof provider.authorize).toBe("function");
   });
diff --git a/src/pages/api/auth/[...nextauth].js b/src/pages/api/auth/[...nextauth].js
index a01403b2c..a6c3f652c 100644
--- a/src/pages/api/auth/[...nextauth].js
+++ b/src/pages/api/auth/[...nextauth].js
@@ -67,7 +67,6 @@ if (authEnabled) {
   } else {
     providers = [
       CredentialsProvider({
-        id: "homepage-password",
         name: "Password",
         credentials: {
           password: { label: "Password", type: "password" },
diff --git a/src/pages/auth/signin.jsx b/src/pages/auth/signin.jsx
index bca4fff87..2ff4b8220 100644
--- a/src/pages/auth/signin.jsx
+++ b/src/pages/auth/signin.jsx
@@ -102,7 +102,10 @@ export default function SignIn({ providers, settings }) {
     );
   }
 
-  const hasPasswordProvider = Boolean(providers?.["homepage-password"]);
+  const passwordProvider = providers
+    ? Object.values(providers).find((provider) => provider.type === "credentials")
+    : null;
+  const hasPasswordProvider = Boolean(passwordProvider);
 
   return (
     <>
@@ -147,7 +150,7 @@ export default function SignIn({ providers, settings }) {
                       className="space-y-3"
                       onSubmit={async (event) => {
                         event.preventDefault();
-                        await signIn("homepage-password", {
+                        await signIn(passwordProvider?.id ?? "credentials", {
                           redirect: true,
                           callbackUrl,
                           password,