From 95569e44e4c24e245866adb4e9fe204f8d4f238a Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <30633324+JarrodMFlesch@users.noreply.github.com>
Date: Fri, 16 Aug 2024 12:07:53 -0400
Subject: [PATCH] fix: login with username server validations (#7719)

---
 packages/payload/src/auth/ensureUsernameOrEmail.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/payload/src/auth/ensureUsernameOrEmail.ts b/packages/payload/src/auth/ensureUsernameOrEmail.ts
index 0113243a1..578e6552e 100644
--- a/packages/payload/src/auth/ensureUsernameOrEmail.ts
+++ b/packages/payload/src/auth/ensureUsernameOrEmail.ts
@@ -44,11 +44,11 @@ export const ensureUsernameOrEmail = <TSlug extends CollectionSlug>({
         missingFields = true
       }
       // prevent clearing email if no username
-      if ('email' in data && !data.email && !originalDoc.username) {
+      if ('email' in data && !data.email && !originalDoc.username && !data?.username) {
         missingFields = true
       }
       // prevent clearing username if no email
-      if ('username' in data && !data.username && !originalDoc.email) {
+      if ('username' in data && !data.username && !originalDoc.email && !data?.email) {
         missingFields = true
       }
     }