diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/BasicTheme.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/BasicTheme.cs
index a9aeedd167..01d3a35db2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/BasicTheme.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/BasicTheme.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic
                 case StandardLayouts.Application:
                     return "~/Themes/Basic/Layouts/Application.cshtml";
                 case StandardLayouts.Account:
-                    return "~/Themes/Basic/Layouts/Application.cshtml";
+                    return "~/Themes/Basic/Layouts/Account.cshtml";
                 case StandardLayouts.Empty:
                     return "~/Themes/Basic/Layouts/Empty.cshtml";
                 default:
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
new file mode 100644
index 0000000000..80c181d09e
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
@@ -0,0 +1,48 @@
+﻿@using Volo.Abp.AspNetCore.Mvc.AntiForgery
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components
+@inject IAbpAntiForgeryManager AbpAntiForgeryManager
+@inject IBrandingProvider BrandingProvider
+@{
+    Layout = null;
+    AbpAntiForgeryManager.SetCookie();
+    var containerClass = ViewBag.FluidLayout == true ? "container-fluid" : "container"; //TODO: Better and type-safe options
+}
+
+<!DOCTYPE html>
+
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <title>@(ViewBag.Title == null ? BrandingProvider.AppName : ViewBag.Title)</title>
+
+    <abp-style-bundle name="@BasicThemeBundles.Styles.Global" />
+
+    @RenderSection("styles", false)
+</head>
+<body>
+
+    @(await Component.InvokeAsync<MainNavbarViewComponent>())
+
+    <div class="@containerClass">
+        <abp-row>
+            <abp-column size-md="_4" offset-md="_4">
+                @(await Component.InvokeAsync<PageAlertsViewComponent>())
+                @RenderBody()
+            </abp-column>
+        </abp-row>
+    </div>
+
+    <abp-script-bundle name="@BasicThemeBundles.Scripts.Global" />
+
+    <script type="text/javascript" src="~/Abp/ApplicationConfigurationScript"></script>
+    <script type="text/javascript" src="~/Abp/ServiceProxyScript"></script>
+
+    @RenderSection("scripts", false)
+
+</body>
+</html>
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
index bd118b8019..2faa35532b 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
@@ -4,33 +4,27 @@
 @inherits Volo.Abp.Account.Web.Pages.Account.AccountPage
 @inject Volo.Abp.Settings.ISettingManager SettingManager
 <h2>@L["Login"]</h2>
-<abp-row>
-    <abp-column size-md="_3">
-        <form method="post">
-            <abp-input asp-for="Input.UserNameOrEmailAddress" auto-focus="true" />
-            <abp-input asp-for="Input.Password" />
-            <abp-input asp-for="Input.RememberMe" class="mb-3" />
-            <abp-button button-type="Primary" type="submit">@L["Login"]</abp-button>
-            @if (string.Equals(await SettingManager.GetOrNullAsync(AccountSettingNames.IsSelfRegistrationEnabled), "true", StringComparison.OrdinalIgnoreCase))
-            {
-                <a abp-button="Secondary" href="@Url.Page("./Register", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})">@L["Register"]</a>
-            }
-        </form>
-    </abp-column>
 
-    @if (Model.ExternalLogins.Any())
+<form method="post">
+    <abp-input asp-for="Input.UserNameOrEmailAddress" auto-focus="true" />
+    <abp-input asp-for="Input.Password" />
+    <abp-input asp-for="Input.RememberMe" class="mb-3" />
+    <abp-button button-type="Primary" type="submit">@L["Login"]</abp-button>
+    @if (string.Equals(await SettingManager.GetOrNullAsync(AccountSettingNames.IsSelfRegistrationEnabled), "true", StringComparison.OrdinalIgnoreCase))
     {
-        <abp-column size-md="_3">
-            <h4>Use another service to log in.</h4>
-            <form asp-page="./Login" asp-page-handler="ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" asp-route-returnUrlHash="@Model.ReturnUrlHash" method="post">
-                <div>
-                    @foreach (var provider in Model.ExternalLogins)
-                    {
-                        <abp-button button-type="Primary" type="submit" name="provider" value="@provider.Name">@provider.DisplayName</abp-button>
-                    }
-                </div>
-            </form>
-        </abp-column>
+        <a abp-button="Secondary" href="@Url.Page("./Register", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})">@L["Register"]</a>
     }
+</form>
 
-</abp-row>
\ No newline at end of file
+@if (Model.ExternalLogins.Any())
+{
+    <h4>Use another service to log in.</h4>
+    <form asp-page="./Login" asp-page-handler="ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" asp-route-returnUrlHash="@Model.ReturnUrlHash" method="post">
+        <div>
+            @foreach (var provider in Model.ExternalLogins)
+            {
+                <abp-button button-type="Primary" type="submit" name="provider" value="@provider.Name">@provider.DisplayName</abp-button>
+            }
+        </div>
+    </form>
+}
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml
index c9a98394f5..dd8b9d0ff0 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml
@@ -2,13 +2,9 @@
 @model Volo.Abp.Account.Web.Pages.Account.RegisterModel
 @inherits Volo.Abp.Account.Web.Pages.Account.AccountPage
 <h2>@L["Register"]</h2>
-<abp-row>
-    <abp-column size-md="_3">
-        <form method="post">
-            <abp-input asp-for="Input.UserName" auto-focus="true" />
-            <abp-input asp-for="Input.EmailAddress" />
-            <abp-input asp-for="Input.Password" />
-            <abp-button button-type="Primary" type="submit">@L["Register"]</abp-button>
-        </form>
-    </abp-column>
-</abp-row>
\ No newline at end of file
+<form method="post">
+    <abp-input asp-for="Input.UserName" auto-focus="true" />
+    <abp-input asp-for="Input.EmailAddress" />
+    <abp-input asp-for="Input.Password" />
+    <abp-button button-type="Primary" type="submit">@L["Register"]</abp-button>
+</form>
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/_ViewStart.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/_ViewStart.cshtml
new file mode 100644
index 0000000000..54f5b26aaa
--- /dev/null
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/_ViewStart.cshtml
@@ -0,0 +1,5 @@
+﻿@using Volo.Abp.AspNetCore.Mvc.UI.Theming
+@inject IThemeManager ThemeManager
+@{
+    Layout = ThemeManager.CurrentTheme.GetAccountLayout();
+}
\ No newline at end of file
