diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
index 85e39ff8c7..6e72ebf703 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.Identity.AspNetCore
 {
@@ -50,7 +51,7 @@ namespace Volo.Abp.Identity.AspNetCore
                     if (user == null)
                     {
                         user = await externalLoginProvider.CreateUserAsync(userName);
-                        //TODO: TenantId, LoginProvider, Password, NormalizeNames
+                        //TODO: +TenantId, LoginProvider, Password, +NormalizeNames
                         //TODO: Set default roles
                         await UserManager.CreateAsync(user);
                     }
diff --git a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/FakeExternalLoginProvider.cs b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/FakeExternalLoginProvider.cs
index c95d65143f..64277765d2 100644
--- a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/FakeExternalLoginProvider.cs
+++ b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/FakeExternalLoginProvider.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.Identity.AspNetCore
 {
@@ -8,6 +9,13 @@ namespace Volo.Abp.Identity.AspNetCore
     {
         public const string Name = "Fake";
 
+        private readonly ICurrentTenant _currentTenant;
+
+        public FakeExternalLoginProvider(ICurrentTenant currentTenant)
+        {
+            _currentTenant = currentTenant;
+        }
+
         public override Task<bool> TryAuthenticateAsync(string userName, string plainPassword)
         {
             return Task.FromResult(
@@ -21,7 +29,8 @@ namespace Volo.Abp.Identity.AspNetCore
                 new IdentityUser(
                     Guid.NewGuid(),
                     userName,
-                    "test@abp.io"
+                    "test@abp.io",
+                    tenantId: _currentTenant.Id
                 )
             );
         }