Fix User Registration (#16621)

OrchardCMS · Aug 26, 2024 · 8221b22 · 8221b22
1 parent dc69322
commit 8221b22
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/RegisterUserFormDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/RegisterUserFormDisplayDriver.cs
@@ -42,11 +42,11 @@ public override async Task<IDisplayResult> UpdateAsync(RegisterUserForm model, U
 
         await context.Updater.TryUpdateModelAsync(vm, Prefix);
 
-        if (await _userManager.FindByNameAsync(vm.UserName) != null)
+        if (!string.IsNullOrEmpty(vm.UserName) && await _userManager.FindByNameAsync(vm.UserName) != null)
         {
             context.Updater.ModelState.AddModelError(Prefix, nameof(vm.UserName), S["A user with the same username already exists."]);
         }
-        else if (_identityOptions.User.RequireUniqueEmail && await _userManager.FindByEmailAsync(vm.Email) != null)
+        else if (_identityOptions.User.RequireUniqueEmail && !string.IsNullOrEmpty(vm.Email) && await _userManager.FindByEmailAsync(vm.Email) != null)
         {
             context.Updater.ModelState.AddModelError(Prefix, nameof(vm.Email), S["A user with the same email address already exists."]);
         }