diff --git a/docs/en/CLI.md b/docs/en/CLI.md
index 6a5a331e8f..75e3e027b4 100644
--- a/docs/en/CLI.md
+++ b/docs/en/CLI.md
@@ -172,7 +172,11 @@ Some features of the CLI requires to be logged in to abp.io platform. To login w
 abp login <username>
 ```
 
-Notice that, a new login with an already active session, will kill the previous session and creates a new one.
+```bash
+abp login <username> -p <password>
+```
+
+Notice that, a new login with an already active session, overwrites the previous session.
 
 ### logout
 
diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
index e194c1544d..60f55497da 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
@@ -29,12 +29,12 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         public IdentityServerSupportedLoginModel(
             IAuthenticationSchemeProvider schemeProvider,
-            IOptions<AbpAccountOptions> accountOptions, 
-            IIdentityServerInteractionService interaction, 
-            IClientStore clientStore, 
+            IOptions<AbpAccountOptions> accountOptions,
+            IIdentityServerInteractionService interaction,
+            IClientStore clientStore,
             IEventService identityServerEvents)
             :base(
-                schemeProvider, 
+                schemeProvider,
                 accountOptions)
         {
             Interaction = interaction;
@@ -95,7 +95,6 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return Page();
         }
 
-        [UnitOfWork] //TODO: Will be removed when we implement action filter
         public override async Task<IActionResult> OnPostAsync(string action)
         {
             if (action == "Cancel")
@@ -116,7 +115,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             ValidateModel();
 
             ExternalProviders = await GetExternalProviders();
-            
+
             EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin);
 
             await ReplaceEmailToUsernameOfInputIfNeeds();
@@ -166,7 +165,6 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return RedirectSafely(ReturnUrl, ReturnUrlHash);
         }
 
-        [UnitOfWork]
         public override async Task<IActionResult> OnPostExternalLogin(string provider)
         {
             if (AccountOptions.WindowsAuthenticationSchemeName == provider)