From 398946ddc30b0a711b652181cfdbcd136667aab3 Mon Sep 17 00:00:00 2001 From: i-just Date: Tue, 9 Dec 2025 08:50:23 +0100 Subject: [PATCH 1/2] order by credentialed users first --- src/services/Users.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/services/Users.php b/src/services/Users.php index 5ed4e9364bb..f5395855ac5 100644 --- a/src/services/Users.php +++ b/src/services/Users.php @@ -294,6 +294,9 @@ public function getUserByUsernameOrEmail(string $usernameOrEmail): ?User ]); } + // order by credentialed users first + $query->orderBy(['users.active' => SORT_DESC, 'users.pending' => SORT_DESC]); + /** @var User|null */ return $query->one(); } From 5f48b70a6fac1f95cd1b2c603b5fbdcf684bb7e5 Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Tue, 9 Dec 2025 17:01:31 -0800 Subject: [PATCH 2/2] Release note [ci skip] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6579425a43..b05b3bf0d47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - Fixed a bug where Matrix fields’ Entry Types settings were partially interactive when admin changes were disallowed. ([#18145](https://github.com/craftcms/cms/pull/18145)) +- Fixed a bug where users could be unable to sign in if an inactive user account existed with the same email address. ([#18148](https://github.com/craftcms/cms/issues/18148)) ## 5.8.21 - 2025-12-04