diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
index acb6a77c..87d4fd99 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
@@ -32,7 +32,7 @@ public interface IBotSharpRepository : IHaveServiceProvider
     User? GetUserById(string id) => throw new NotImplementedException();
     List<User> GetUserByIds(List<string> ids) => throw new NotImplementedException();
     List<User> GetUsersByAffiliateId(string affiliateId) => throw new NotImplementedException();
-    User? GetUserByUserName(string userName, string regionCode = "CN") => throw new NotImplementedException();
+    User? GetUserByUserName(string userName) => throw new NotImplementedException();
     Dashboard? GetDashboard(string id = null) => throw new NotImplementedException();
     void CreateUser(User user) => throw new NotImplementedException();
     void UpdateExistUser(string userId, User user) => throw new NotImplementedException();
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
index 989c9ef9..9d5b42be 100644
--- a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
+++ b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
@@ -48,9 +48,9 @@ public partial class FileRepository
         return Users.Where(x => x.AffiliateId == affiliateId).ToList();
     }
 
-    public User? GetUserByUserName(string userName = null, string regionCode = "CN")
+    public User? GetUserByUserName(string userName = null)
     {
-        return Users.FirstOrDefault(x => x.UserName == userName.ToLower() && x.RegionCode == regionCode.ToLower());
+        return Users.FirstOrDefault(x => x.UserName == userName.ToLower());
     }
 
     public Dashboard? GetDashboard(string id = null)
diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
index 991ef0df..a87c55fa 100644
--- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
+++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
@@ -50,7 +50,7 @@ public class UserService : IUserService
 
         if (!string.IsNullOrWhiteSpace(user.UserName))
         {
-            record = db.GetUserByUserName(user.UserName, regionCode: user.RegionCode);
+            record = db.GetUserByUserName(user.UserName);
         }
 
         if (record != null && record.Verified)
@@ -214,7 +214,7 @@ public class UserService : IUserService
         var (id, password, regionCode) = base64.SplitAsTuple(":");
 
         var db = _services.GetRequiredService<IBotSharpRepository>();
-        var record = id.Contains("@") ? db.GetUserByEmail(id) : db.GetUserByUserName(id, regionCode: regionCode);
+        var record = id.Contains("@") ? db.GetUserByEmail(id) : db.GetUserByUserName(id);
         if (record == null)
         {
             record = db.GetUserByPhone(id, regionCode: regionCode);
@@ -384,7 +384,7 @@ public class UserService : IUserService
         }
         else if (_user.UserName != null)
         {
-            user = db.GetUserByUserName(_user.UserName, _user.RegionCode);
+            user = db.GetUserByUserName(_user.UserName);
         }
         else if (_user.Email != null)
         {
@@ -471,7 +471,7 @@ public class UserService : IUserService
     {
         var id = model.UserName;
         var db = _services.GetRequiredService<IBotSharpRepository>();
-        var record = id.Contains("@") ? db.GetUserByEmail(id) : db.GetUserByUserName(id, regionCode: (string.IsNullOrWhiteSpace(model.RegionCode) ? "CN" : model.RegionCode));
+        var record = id.Contains("@") ? db.GetUserByEmail(id) : db.GetUserByUserName(id);
         if (record == null)
         {
             record = db.GetUserByPhone(id, regionCode: (string.IsNullOrWhiteSpace(model.RegionCode) ? "CN" : model.RegionCode));
@@ -515,7 +515,7 @@ public class UserService : IUserService
 
         var db = _services.GetRequiredService<IBotSharpRepository>();
 
-        var user = db.GetUserByUserName(userName, regionCode: "CN");
+        var user = db.GetUserByUserName(userName);
         if (user != null && user.Verified)
         {
             return true;
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs
index c463541f..2c4676ca 100644
--- a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs
+++ b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs
@@ -61,9 +61,9 @@ public partial class MongoRepository
         return users?.Any() == true ? users.Select(x => x.ToUser()).ToList() : new List<User>();
     }
 
-    public User? GetUserByUserName(string userName, string regionCode = "CN")
+    public User? GetUserByUserName(string userName)
     {
-        var user = _dc.Users.AsQueryable().FirstOrDefault(x => x.UserName == userName.ToLower() && x.RegionCode == regionCode.ToLower());
+        var user = _dc.Users.AsQueryable().FirstOrDefault(x => x.UserName == userName.ToLower());
         return user != null ? user.ToUser() : null;
     }