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 297e54cd69..09392e50b1 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
@@ -17,9 +17,7 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.Identity;
 using Volo.Abp.Identity.AspNetCore;
 using Volo.Abp.MultiTenancy;
-using Volo.Abp.SecurityLog;
 using Volo.Abp.Settings;
-using Volo.Abp.Uow;
 
 namespace Volo.Abp.Account.Web.Pages.Account
 {
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ForgotPassword.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ForgotPassword.cshtml
index 3702369fae..dd7d7586d0 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ForgotPassword.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ForgotPassword.cshtml
@@ -4,18 +4,18 @@
 @using Volo.Abp.Account.Localization
 @model Volo.Abp.Account.Web.Pages.Account.ForgotPasswordModel
 @inject Volo.Abp.AspNetCore.Mvc.UI.Layout.IPageLayout PageLayout
-@{
-    PageLayout.Content.Title = L["ForgotPassword"].Value;
-}
-<div class="account-module-form">
-    <form method="post">
-        <p>@L["SendPasswordResetLink_Information"]</p>
-        <input asp-for="ReturnUrl"/>
-        <input asp-for="ReturnUrlHash"/>
-        <abp-input asp-for="Email"/>
-        <abp-button button-type="Primary" size="Block" type="submit" class="mt-2 mb-3">@L["Submit"]</abp-button>
-        <a asp-page="./Login" asp-all-route-data="@(new Dictionary<string, string>{ {"returnUrl",Model.ReturnUrl}, {"returnUrlHash",Model.ReturnUrlHash} })">
-            <i class="fa fa-long-arrow-left"></i> @L["Login"]
-        </a>
-    </form>
+<div class="card mt-3 shadow-sm rounded">
+    <div class="card-body p-5">
+        <h4>@L["ForgotPassword"]</h4>
+        <form method="post" class="mt-4">
+            <p>@L["SendPasswordResetLink_Information"]</p>
+            <input asp-for="ReturnUrl"/>
+            <input asp-for="ReturnUrlHash"/>
+            <abp-input asp-for="Email"/>
+            <abp-button button-type="Primary" size="Block" type="submit" class="mt-2 mb-3">@L["Submit"]</abp-button>
+            <a asp-page="./Login" asp-all-route-data="@(new Dictionary<string, string> {{"returnUrl", Model.ReturnUrl}, {"returnUrlHash", Model.ReturnUrlHash}})">
+                <i class="fa fa-long-arrow-left"></i> @L["Login"]
+            </a>
+        </form>
+    </div>
 </div>
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/PasswordResetLinkSent.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/PasswordResetLinkSent.cshtml
index d970af73e3..8bd2e2ebb5 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/PasswordResetLinkSent.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/PasswordResetLinkSent.cshtml
@@ -4,10 +4,12 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.Account.Localization
 @inject IHtmlLocalizer<AccountResource> L
-@{
-    PageLayout.Content.Title = L["ForgotPassword"].Value;
-}
-<p>@L["PasswordResetMailSentMessage"]</p>
-<div class="mt-4">
-    <a abp-button="Primary" asp-page="./Login" asp-all-route-data="@(new Dictionary<string, string>{ {"returnUrl",Model.ReturnUrl}, {"returnUrlHash",Model.ReturnUrlHash} })">&larr; @L["BackToLogin"]</a>
+<div class="card mt-3 shadow-sm rounded">
+    <div class="card-body p-5">
+        <h4>@L["ForgotPassword"]</h4>
+        <form method="post" class="mt-4">
+            <p>@L["PasswordResetMailSentMessage"]</p>
+            <a abp-button="Primary" asp-page="./Login" asp-all-route-data="@(new Dictionary<string, string> {{"returnUrl", Model.ReturnUrl}, {"returnUrlHash", Model.ReturnUrlHash}})">&larr; @L["BackToLogin"]</a>
+        </form>
+    </div>
 </div>
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml
index 4373be552e..64d835497c 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml
@@ -4,19 +4,19 @@
 @using Volo.Abp.Account.Localization
 @model Volo.Abp.Account.Web.Pages.Account.ResetPasswordModel
 @inject Volo.Abp.AspNetCore.Mvc.UI.Layout.IPageLayout PageLayout
-@{
-    PageLayout.Content.Title = L["ResetPassword"].Value;
-}
-<form method="post">
-    <p>@L["ResetPassword_Information"]</p>
-
-    <abp-input asp-for="ReturnUrl" />
-    <abp-input asp-for="ReturnUrlHash" />
-    <abp-input asp-for="UserId" />
-    <abp-input asp-for="ResetToken" />
-    <abp-input asp-for="Password" />
-    <abp-input asp-for="ConfirmPassword" />
-
-    <a abp-button="Secondary" asp-page="./Login">@L["Cancel"]</a>
-    <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value" />
-</form>
+<div class="card mt-3 shadow-sm rounded">
+    <div class="card-body p-5">
+        <h4>@L["ResetPassword"]</h4>
+        <form method="post">
+            <p>@L["ResetPassword_Information"]</p>
+            <abp-input asp-for="ReturnUrl"/>
+            <abp-input asp-for="ReturnUrlHash"/>
+            <abp-input asp-for="UserId"/>
+            <abp-input asp-for="ResetToken"/>
+            <abp-input asp-for="Password"/>
+            <abp-input asp-for="ConfirmPassword"/>
+            <a abp-button="Secondary" asp-page="./Login">@L["Cancel"]</a>
+            <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value"/>
+        </form>
+    </div>
+</div>
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPasswordConfirmation.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPasswordConfirmation.cshtml
index f29e6620f5..32c514656c 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPasswordConfirmation.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPasswordConfirmation.cshtml
@@ -4,8 +4,10 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.Account.Localization
 @inject IHtmlLocalizer<AccountResource> L
-@{
-    PageLayout.Content.Title = L["ResetPassword"].Value;
-}
-<p>@L["YourPasswordIsSuccessfullyReset"]</p>
-<a abp-button="Primary" href="@Url.Content(Model.ReturnUrl)">@L["GoToTheApplication"]</a>
+<div class="card mt-3 shadow-sm rounded">
+    <div class="card-body p-5">
+        <h4>@L["ResetPassword"]</h4>
+        <p>@L["YourPasswordIsSuccessfullyReset"]</p>
+        <a abp-button="Primary" href="@Url.Content(Model.ReturnUrl)">@L["GoToTheApplication"]</a>
+    </div>
+</div>