diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
index 5cd329d5..21567df8 100644
--- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
+++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
@@ -46,15 +46,19 @@ public class UserService : IUserService
 
         var db = _services.GetRequiredService<IBotSharpRepository>();
 
+        User? record = null;
 
-        var record = db.GetUserByPhone(user.Phone);
+        if (user.Phone != null)
+        {
+            record = db.GetUserByPhone(user.Phone);
+        }
 
-        if (record == null)
+        if (record == null && user.Email != null)
         {
             record = db.GetUserByEmail(user.Email);
         }
 
-        if (record == null)
+        if (record == null && user.UserName != null)
         {
             record = db.GetUserByUserName(user.UserName);
         }