diff --git a/authentik/core/token_auth.py b/authentik/core/token_auth.py
index 1c95ce996..cc52ed116 100644
--- a/authentik/core/token_auth.py
+++ b/authentik/core/token_auth.py
@@ -26,4 +26,4 @@ class TokenBackend(ModelBackend):
         )
         if not tokens.exists():
             return None
-        return user
+        return tokens.first().user
diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index c09f84d65..ac173bc2f 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -4763,6 +4763,18 @@ msgstr "User Reputation"
 msgid "User Settings"
 msgstr "User Settings"
 
+#: src/pages/stages/password/PasswordStageForm.ts
+msgid "User database + LDAP password"
+msgstr "User database + LDAP password"
+
+#: src/pages/stages/password/PasswordStageForm.ts
+msgid "User database + app passwords"
+msgstr "User database + app passwords"
+
+#: src/pages/stages/password/PasswordStageForm.ts
+msgid "User database + standard password"
+msgstr "User database + standard password"
+
 #: src/pages/user-settings/UserSettingsPage.ts
 msgid "User details"
 msgstr "User details"
@@ -5049,13 +5061,13 @@ msgstr "You can only select providers that match the type of the outpost."
 msgid "You're currently impersonating {0}. Click to stop."
 msgstr "You're currently impersonating {0}. Click to stop."
 
-#: src/pages/stages/password/PasswordStageForm.ts
-msgid "authentik Builtin Database"
-msgstr "authentik Builtin Database"
+#: 
+#~ msgid "authentik Builtin Database"
+#~ msgstr "authentik Builtin Database"
 
-#: src/pages/stages/password/PasswordStageForm.ts
-msgid "authentik LDAP Backend"
-msgstr "authentik LDAP Backend"
+#: 
+#~ msgid "authentik LDAP Backend"
+#~ msgstr "authentik LDAP Backend"
 
 #: src/elements/forms/DeleteForm.ts
 msgid "connecting object will be deleted"
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index 36be57c10..1a9d0ae1f 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -4748,6 +4748,18 @@ msgstr ""
 msgid "User Settings"
 msgstr ""
 
+#: src/pages/stages/password/PasswordStageForm.ts
+msgid "User database + LDAP password"
+msgstr ""
+
+#: src/pages/stages/password/PasswordStageForm.ts
+msgid "User database + app passwords"
+msgstr ""
+
+#: src/pages/stages/password/PasswordStageForm.ts
+msgid "User database + standard password"
+msgstr ""
+
 #: src/pages/user-settings/UserSettingsPage.ts
 msgid "User details"
 msgstr ""
@@ -5032,13 +5044,13 @@ msgstr ""
 msgid "You're currently impersonating {0}. Click to stop."
 msgstr ""
 
-#: src/pages/stages/password/PasswordStageForm.ts
-msgid "authentik Builtin Database"
-msgstr ""
+#: 
+#~ msgid "authentik Builtin Database"
+#~ msgstr ""
 
-#: src/pages/stages/password/PasswordStageForm.ts
-msgid "authentik LDAP Backend"
-msgstr ""
+#: 
+#~ msgid "authentik LDAP Backend"
+#~ msgstr ""
 
 #: src/elements/forms/DeleteForm.ts
 msgid "connecting object will be deleted"
diff --git a/web/src/pages/stages/password/PasswordStageForm.ts b/web/src/pages/stages/password/PasswordStageForm.ts
index 07152dfc4..dbe56340c 100644
--- a/web/src/pages/stages/password/PasswordStageForm.ts
+++ b/web/src/pages/stages/password/PasswordStageForm.ts
@@ -81,7 +81,15 @@ export class PasswordStageForm extends ModelForm<PasswordStage, string> {
                                     BackendsEnum.DjangoContribAuthBackendsModelBackend,
                                 )}
                             >
-                                ${t`authentik Builtin Database`}
+                                ${t`User database + standard password`}
+                            </option>
+                            <option
+                                value=${BackendsEnum.AuthentikCoreTokenAuthTokenBackend}
+                                ?selected=${this.isBackendSelected(
+                                    BackendsEnum.AuthentikCoreTokenAuthTokenBackend,
+                                )}
+                            >
+                                ${t`User database + app passwords`}
                             </option>
                             <option
                                 value=${BackendsEnum.AuthentikSourcesLdapAuthLdapBackend}
@@ -89,7 +97,7 @@ export class PasswordStageForm extends ModelForm<PasswordStage, string> {
                                     BackendsEnum.AuthentikSourcesLdapAuthLdapBackend,
                                 )}
                             >
-                                ${t`authentik LDAP Backend`}
+                                ${t`User database + LDAP password`}
                             </option>
                         </select>
                         <p class="pf-c-form__helper-text">