From e277a6a8f945e4cfc2a9085907752f7bb217fc77 Mon Sep 17 00:00:00 2001
From: Yaser Moradi <ysmoradi@outlook.com>
Date: Wed, 22 Nov 2023 01:39:52 +0100
Subject: [PATCH] feat(templates): add support for refresh token #6071 (#6072)

---
 .../.azure-devops/workflows/cd.yml            |   4 +-
 .../Bit.BlazorWeb/.github/workflows/cd.yml    |   9 +-
 .../BlazorWeb.Client/BlazorWeb.Client.csproj  |   2 -
 ...Extensions.cs => ICollectionExtensions.cs} |  12 +-
 .../Extensions/IJSRuntimeExtension.cs         |  73 +++
 .../IServiceCollectionExtensions.cs           |  13 +-
 .../Extensions/JsRuntimeExtension.cs          |  22 -
 .../Categories/AddOrEditCategoryPage.razor    |   4 +-
 .../Pages/Categories/CategoriesPage.razor.cs  |   2 +-
 .../DeleteAccountConfirmModal.razor.cs        |   4 +-
 .../Pages/Identity/EditProfilePage.razor      |  26 +-
 .../Pages/Identity/EditProfilePage.razor.cs   |   9 +-
 .../Identity/EmailConfirmationPage.razor      |  10 +-
 .../Identity/EmailConfirmationPage.razor.cs   |  25 +-
 .../Pages/Identity/ForgotPasswordPage.razor   |   8 +-
 .../Identity/ForgotPasswordPage.razor.cs      |   2 +-
 .../Pages/Identity/ResetPasswordPage.razor    |   8 +-
 .../Pages/Identity/ResetPasswordPage.razor.cs |  12 +-
 .../Pages/Identity/SignInPage.razor           |  24 +-
 .../Pages/Identity/SignInPage.razor.cs        |  13 +-
 .../Pages/Identity/SignUpPage.razor           |  20 +-
 .../Pages/Identity/SignUpPage.razor.cs        |   6 +-
 .../Pages/NotAuthorizedPage.razor             |   4 +-
 .../Pages/NotAuthorizedPage.razor.cs          |  46 +-
 .../BlazorWeb.Client/Pages/NotFoundPage.razor |   2 -
 .../Pages/Products/ProductsPage.razor         |   2 +-
 .../Pages/Products/ProductsPage.razor.cs      |   2 +-
 .../BlazorWeb.Client/Pages/TermsPage.razor    |  18 +-
 .../Pages/Todo/TodoPage.razor                 |  20 +-
 .../src/BlazorWeb.Client/Program.cs           |   3 +-
 .../src/BlazorWeb.Client/Scripts/app.ts       |   8 +-
 .../AppAuthenticationStateProvider.cs         |  27 +-
 .../Services/AuthenticationService.cs         |  30 --
 .../Services/ClientSideAuthTokenProvider.cs   |   4 +-
 .../Contracts/IAuthenticationService.cs       |  10 -
 .../Services/Contracts/IPubSubService.cs      |   2 +-
 .../Services/ExceptionHandler.cs              |  38 +-
 .../AuthDelegatingHandler.cs                  |  72 +--
 .../ExceptionDelegatingHandler.cs             |  29 +-
 ....cs => RequestHeadersDelegationHandler.cs} |  18 +-
 .../RetryDelegatingHandler.cs                 |  15 +-
 .../Services/PrerenderStateService.cs         |  12 +-
 .../Services/PubSubService.cs                 |  14 +-
 .../Services/RenderModeProvider.cs            |  10 +-
 .../Shared/AppComponentBase.cs                |   6 +-
 .../Shared/AppDataAnnotationsValidator.cs     |  28 +-
 .../ChangePrerenderResponseStatusCode.cs      |  35 --
 .../BlazorWeb.Client/Shared/Footer.razor.cs   |   6 +-
 .../src/BlazorWeb.Client/Shared/Header.razor  |   2 +-
 .../BlazorWeb.Client/Shared/Header.razor.cs   |   4 +-
 .../Shared/MainLayout.razor.cs                |   8 +-
 .../BlazorWeb.Client/Shared/NavMenu.razor.cs  |   4 +-
 .../Shared/PageNotFound.razor                 |   8 -
 .../Shared/PageNotFound.razor.scss            |  30 --
 .../Shared/SignOutConfirmModal.razor.cs       |   4 +-
 .../src/BlazorWeb.Client/appsettings.json     |   9 -
 .../src/BlazorWeb.Client/compilerconfig.json  |  60 +--
 .../src/BlazorWeb.Infra/BlazorWeb.Iac.csproj  |   2 -
 .../src/BlazorWeb.Infra/BwStack.cs            |   2 +-
 .../src/BlazorWeb.Server/AppSettings.cs       |  16 +-
 .../BlazorWeb.Server/BlazorWeb.Server.csproj  |   5 +-
 .../Components/ResetPasswordTemplate.razor    |   2 +-
 .../Controllers/AppControllerBase.cs          |   2 -
 .../Controllers/AttachmentController.cs       |  14 +-
 .../Categories/CategoryController.cs          |   8 +-
 ...uthController.cs => IdentityController.cs} | 123 +++--
 .../Controllers/Identity/UserController.cs    |  10 +-
 .../Controllers/Products/ProductController.cs |   6 +-
 .../Controllers/Todo/TodoItemController.cs    |   6 +-
 .../src/BlazorWeb.Server/Data/AppDbContext.cs |  12 +-
 .../Identity/UserConfiguration.cs             |   1 +
 ...231118003945_InitialMigration.Designer.cs} |  29 +-
 ....cs => 20231118003945_InitialMigration.cs} |  24 +-
 .../Migrations/AppDbContextModelSnapshot.cs   |  27 +-
 .../IServiceCollectionExtensions.cs           | 132 +++---
 .../Extensions/ODataOperationFilter.cs        |   5 +-
 .../BlazorWeb.Server/Mappers/TodoMapper.cs    |   4 +-
 .../Services/ApiExceptionHandler.cs           |   6 +-
 .../Services/AppIdentityErrorDescriber.cs     |  61 +++
 .../Services/AppSecureJwtDataFormat.cs        |  56 +++
 .../Services/Contracts/IJwtService.cs         |   9 -
 .../Contracts/IUserInformationProvider.cs     |  14 -
 .../BlazorWeb.Server/Services/JwtService.cs   |  49 --
 .../Services/ServerSideAuthTokenProvider.cs   |  10 +-
 .../Services/UserInformationProvider.cs       |  57 ---
 .../BlazorWeb.Server/Startup/Middlewares.cs   |  75 +++-
 .../src/BlazorWeb.Server/Startup/Services.cs  |   9 +-
 .../src/BlazorWeb.Server/appsettings.json     |  14 +-
 .../wwwroot/swagger/swagger-utils.js          |  12 +-
 .../BlazorWeb.Shared/Dtos/AppJsonContext.cs   |   7 +-
 .../Dtos/Identity/RefreshRequestDto.cs        |   8 +
 .../Dtos/Identity/SignInRequestDto.cs         |   6 +-
 .../Dtos/Identity/SignUpRequestDto.cs         |   2 +-
 ...gnInResponseDto.cs => TokenResponseDto.cs} |   7 +-
 .../BlazorWeb.Shared/Dtos/PagedResultDto.cs   |   4 +-
 .../Extensions/ClaimsPrincipalExtensions.cs   |   9 +-
 .../IServiceCollectionExtensions.cs           |   2 +-
 .../src/BlazorWeb.Shared/Mapper.cs            |   6 -
 .../Resources/AppStrings.Designer.cs          |  11 +-
 .../Resources/AppStrings.fr.resx              |  10 +-
 .../Resources/AppStrings.resx                 | 424 +++++++++---------
 .../Resources/IdentityStrings.Designer.cs     | 252 -----------
 .../Resources/IdentityStrings.fr.resx         |  84 ----
 .../Resources/IdentityStrings.resx            | 271 ++++-------
 .../Services/Contracts/IAuthTokenProvider.cs  |   1 +
 .../Bit.BlazorWeb/src/Directory.Build.props   |   8 +-
 .../.azure-devops/workflows/cd.yml            |   2 +-
 .../Bit.Boilerplate/.github/workflows/cd.yml  |   2 +-
 .../Bit.Boilerplate/Boilerplate.slnLaunch     |  57 +++
 .../Client/App/Boilerplate.Client.App.csproj  |   1 -
 .../IServiceCollectionExtensions.cs           |   4 +-
 .../src/Client/App/MauiProgram.cs             |   4 +-
 .../src/Client/Core/App.razor.cs              |   2 +-
 .../Core/Boilerplate.Client.Core.csproj       |   2 -
 ...Extensions.cs => ICollectionExtensions.cs} |  12 +-
 .../Extensions/IJSRuntimeExtensions.Hybrid.cs |  60 +++
 .../Core/Extensions/IJSRuntimeExtensions.cs   |  76 ++++
 .../IServiceCollectionExtensions.cs           |  48 +-
 .../Core/Extensions/JsRuntimeExtension.cs     |  22 -
 .../Categories/AddOrEditCategoryPage.razor    |   4 +-
 .../Pages/Categories/CategoriesPage.razor.cs  |   2 +-
 .../DeleteAccountConfirmModal.razor.cs        |   7 +-
 .../Core/Pages/Identity/EditProfilePage.razor |  26 +-
 .../Pages/Identity/EditProfilePage.razor.cs   |   9 +-
 .../Identity/EmailConfirmationPage.razor      |  10 +-
 .../Identity/EmailConfirmationPage.razor.cs   |  25 +-
 .../Pages/Identity/ForgotPasswordPage.razor   |   8 +-
 .../Identity/ForgotPasswordPage.razor.cs      |   2 +-
 .../Pages/Identity/ResetPasswordPage.razor    |   8 +-
 .../Pages/Identity/ResetPasswordPage.razor.cs |  20 +-
 .../Core/Pages/Identity/SignInPage.razor      |  24 +-
 .../Core/Pages/Identity/SignInPage.razor.cs   |  13 +-
 .../Core/Pages/Identity/SignUpPage.razor      |  20 +-
 .../Core/Pages/Identity/SignUpPage.razor.cs   |   6 +-
 .../Core/Pages/Products/ProductsPage.razor    |   2 +-
 .../Core/Pages/Products/ProductsPage.razor.cs |   2 +-
 .../src/Client/Core/Pages/TermsPage.razor     |  18 +-
 .../src/Client/Core/Pages/Todo/TodoPage.razor |  20 +-
 .../src/Client/Core/Scripts/app.ts            |   8 +-
 .../AppAuthenticationStateProvider.cs         |  27 +-
 .../Core/Services/AuthenticationService.cs    |  38 --
 .../Services/ClientSideAuthTokenProvider.cs   |   8 +-
 .../Contracts/IAuthenticationService.cs       |  10 -
 .../Core/Services/Contracts/IPubSubService.cs |   2 +-
 .../Core/Services/ExceptionHandlerBase.cs     |  38 +-
 .../AuthDelegatingHandler.cs                  |  69 +--
 .../ExceptionDelegatingHandler.cs             |  29 +-
 ....cs => RequestHeadersDelegationHandler.cs} |  22 +-
 .../RetryDelegatingHandler.cs                 |  14 +-
 .../Core/Services/PrerenderStateService.cs    |  10 +-
 .../src/Client/Core/Services/PubSubService.cs |  14 +-
 .../Client/Core/Shared/AppComponentBase.cs    |   4 +-
 .../Shared/AppDataAnnotationsValidator.cs     |  28 +-
 .../ChangePrerenderResponseStatusCode.cs      |   6 +-
 .../src/Client/Core/Shared/Footer.razor.cs    |   6 +-
 .../src/Client/Core/Shared/Header.razor       |   2 +-
 .../src/Client/Core/Shared/Header.razor.cs    |   4 +-
 .../Client/Core/Shared/MainLayout.razor.cs    |   8 +-
 .../src/Client/Core/Shared/NavMenu.razor.cs   |   4 +-
 .../Shared/NotAuthorizedComponent.razor.cs    |  41 +-
 .../Core/Shared/SignOutConfirmModal.razor.cs  |   7 +-
 .../src/Client/Core/compilerconfig.json       |  62 +--
 .../IServiceCollectionExtensions.cs           |   4 +-
 .../Client/Web/Program.BlazorWebAssembly.cs   |   7 +-
 .../Services/ServerSideAuthTokenProvider.cs   |  12 +-
 .../src/Client/Web/Startup/Services.cs        |   4 +-
 .../src/Infra/Iac/Boilerplate.Iac.csproj      |   2 -
 .../Bit.Boilerplate/src/Infra/Iac/BpStack.cs  |   2 +-
 .../src/Server/Api/AppSettings.cs             |  16 +-
 .../Server/Api/Boilerplate.Server.Api.csproj  |   3 +-
 .../Api/Controllers/AppControllerBase.cs      |   2 -
 .../Api/Controllers/AttachmentController.cs   |  14 +-
 .../Categories/CategoryController.cs          |   8 +-
 ...uthController.cs => IdentityController.cs} | 133 +++---
 .../Controllers/Identity/UserController.cs    |  10 +-
 .../Controllers/Products/ProductController.cs |   6 +-
 .../Controllers/Todo/TodoItemController.cs    |   6 +-
 .../src/Server/Api/Data/AppDbContext.cs       |   4 +-
 .../Identity/UserConfiguration.cs             |   1 +
 ...231121162004_InitialMigration.Designer.cs} |  29 +-
 ....cs => 20231121162004_InitialMigration.cs} |  24 +-
 .../Migrations/AppDbContextModelSnapshot.cs   |  27 +-
 .../IServiceCollectionExtensions.cs           |  90 ++--
 .../Api/Extensions/ODataOperationFilter.cs    |   5 +-
 .../Api/Resources/ResetPasswordTemplate.razor |   2 +-
 .../Api/Services/ApiExceptionHandler.cs       |   6 +-
 .../Api/Services/AppIdentityErrorDescriber.cs |  61 +++
 .../Api/Services/AppSecureJwtDataFormat.cs    |  56 +++
 .../Api/Services/Contracts/IJwtService.cs     |   9 -
 .../Contracts/IUserInformationProvider.cs     |  14 -
 .../src/Server/Api/Services/JwtService.cs     |  49 --
 .../Api/Services/UserInformationProvider.cs   |  57 ---
 .../src/Server/Api/Startup/Services.cs        |  42 +-
 .../src/Server/Api/appsettings.json           |  14 +-
 .../Api/wwwroot/swagger/swagger-utils.js      |  12 +-
 .../src/Shared/Dtos/AppJsonContext.cs         |   3 +-
 .../Shared/Dtos/Identity/RefreshRequestDto.cs |   8 +
 .../Shared/Dtos/Identity/SignInRequestDto.cs  |   6 +-
 .../{SignInResponseDto.cs => TokenDto.cs}     |   8 +-
 .../src/Shared/Dtos/PagedResultDto.cs         |   4 +-
 .../Extensions/ClaimsPrincipalExtensions.cs   |   9 +-
 .../IServiceCollectionExtensions.cs           |   2 +-
 .../Bit.Boilerplate/src/Shared/Mapper.cs      |   6 -
 .../Shared/Resources/AppStrings.Designer.cs   |  22 +-
 .../src/Shared/Resources/AppStrings.fr.resx   |  10 +-
 .../src/Shared/Resources/AppStrings.resx      | 424 +++++++++---------
 .../Shared/Resources/IdentityStrings.fr.resx  |  84 ----
 .../src/Shared/Resources/IdentityStrings.resx | 271 ++++-------
 .../Services/Contracts/IAuthTokenProvider.cs  |   1 +
 .../Bit.Websites.Careers.Client.csproj        |   2 -
 .../Extensions/IJSRuntimeExtension.cs}        |   2 +-
 .../Extensions/IListExtensions.cs             |   2 +-
 .../IServiceCollectionExtensions.cs           |   7 +-
 .../Bit.Websites.Careers.Client/Program.cs    |   1 -
 .../Bit.Websites.Careers.Client/Routes.razor  |   5 +-
 .../Routes.razor.cs                           |  14 -
 .../Services/Contracts/IPubSubService.cs      |   2 +-
 .../ExceptionDelegatingHandler.cs             |  19 +-
 .../RequestHeadersDelegationHandler.cs        |  15 +
 .../RetryDelegatingHandler.cs                 |  14 +-
 .../Services/PrerenderStateService.cs         |  10 +-
 .../Services/PubSubService.cs                 |  14 +-
 .../Services/RenderModeProvider.cs            |  10 +-
 .../Shared/AppComponentBase.cs                |   2 +-
 .../ChangePrerenderResponseStatusCode.cs      |  35 --
 .../appsettings.json                          |   9 -
 .../compilerconfig.json                       |  34 +-
 .../Bit.Websites.Careers.Server.csproj        |   2 -
 .../IServiceCollectionExtensions.cs           |  32 +-
 .../Startup/Middlewares.cs                    |  55 ++-
 .../Startup/Services.cs                       |   2 +-
 .../IServiceCollectionExtensions.cs           |   2 +-
 .../Careers/src/Directory.Build.props         |   6 +-
 .../Bit.Websites.Platform.Client.csproj       |   2 -
 .../Extensions/IJSRuntimeExtension.cs}        |   2 +-
 .../Extensions/IListExtensions.cs             |   2 +-
 .../IServiceCollectionExtensions.cs           |   7 +-
 .../Pages/ContactUsPage.razor                 |   4 +-
 .../Pages/HomePage.razor                      |  40 +-
 .../Pages/HomePage.razor.cs                   |   2 -
 .../Pages/PricingPage.razor                   |  64 +--
 .../Pages/Templates/DeploymentTypePage.razor  |   6 +-
 .../Pages/Templates/DevOpsPage.razor          |  14 +-
 .../Pages/Templates/HostingModelsPage.razor   |   2 +-
 .../Pages/Templates/OverviewPage.razor        |   2 +-
 .../Pages/Templates/SettingsPage.razor        |   6 +-
 .../Bit.Websites.Platform.Client/Program.cs   |   1 -
 .../Bit.Websites.Platform.Client/Routes.razor |   3 +-
 .../Routes.razor.cs                           |  14 -
 .../Services/Contracts/IPubSubService.cs      |   2 +-
 .../ExceptionDelegatingHandler.cs             |  15 +-
 .../RequestHeadersDelegationHandler.cs        |  15 +
 .../RetryDelegatingHandler.cs                 |  14 +-
 .../Services/PrerenderStateService.cs         |  10 +-
 .../Services/PubSubService.cs                 |  14 +-
 .../Services/RenderModeProvider.cs            |  10 +-
 .../Shared/AppComponentBase.cs                |   2 +-
 .../ChangePrerenderResponseStatusCode.cs      |  35 --
 .../Shared/Header.razor.cs                    |   4 +-
 .../Shared/PageNotFound.razor                 |  15 -
 .../Shared/PageNotFound.razor.cs              |  11 -
 .../Shared/PageNotFound.razor.scss            | 168 -------
 .../appsettings.json                          |   9 -
 .../compilerconfig.json                       | 114 +++--
 .../Bit.Websites.Platform.Server.csproj       |   2 -
 .../Controllers/ContactUsController.cs        |   4 +-
 .../Controllers/SupportPackageController.cs   |   4 +-
 .../IServiceCollectionExtensions.cs           |  32 +-
 .../Services/TelegramBotApiClient.cs          |  12 +-
 .../Services/TelegramBotService.cs            |   6 +-
 .../Startup/Middlewares.cs                    |  53 ++-
 .../Startup/Services.cs                       |   2 +-
 .../IServiceCollectionExtensions.cs           |   2 +-
 .../Platform/src/Directory.Build.props        |   6 +-
 .../Bit.Websites.Sales.Client.csproj          |   2 -
 .../Extensions/IJSRuntimeExtension.cs}        |   2 +-
 .../Extensions/IListExtensions.cs             |   2 +-
 .../IServiceCollectionExtensions.cs           |   7 +-
 .../Pages/AboutPage.razor                     |   6 +-
 .../Pages/HomePage.razor                      |  16 +-
 .../Pages/ServicesPage.razor                  |  48 +-
 .../src/Bit.Websites.Sales.Client/Program.cs  |   1 -
 .../Bit.Websites.Sales.Client/Routes.razor    |   3 +-
 .../Bit.Websites.Sales.Client/Routes.razor.cs |  14 -
 .../Bit.Websites.Sales.Client/Scripts/app.ts  |  23 -
 .../Services/Contracts/IPubSubService.cs      |   2 +-
 .../ExceptionDelegatingHandler.cs             |  15 +-
 .../RequestHeadersDelegationHandler.cs        |  15 +
 .../RetryDelegatingHandler.cs                 |  14 +-
 .../Services/PrerenderStateService.cs         |  10 +-
 .../Services/PubSubService.cs                 |  14 +-
 .../Services/RenderModeProvider.cs            |  10 +-
 .../Shared/AppComponentBase.cs                |   2 +-
 .../ChangePrerenderResponseStatusCode.cs      |  35 --
 .../Shared/MainLayout.razor.cs                |   2 +-
 .../Shared/PageNotFound.razor.cs              |   4 +-
 .../appsettings.json                          |   9 -
 .../compilerconfig.json                       |  52 +--
 .../Bit.Websites.Sales.Server.csproj          |   2 -
 .../Components/App.razor                      |  19 -
 .../Controllers/ContactUsController.cs        |   4 +-
 .../IServiceCollectionExtensions.cs           |  32 +-
 .../Services/TelegramBotApiClient.cs          |  12 +-
 .../Services/TelegramBotService.cs            |   4 +-
 .../Startup/Middlewares.cs                    |  53 ++-
 .../Startup/Services.cs                       |   2 +-
 .../IServiceCollectionExtensions.cs           |   2 +-
 src/Websites/Sales/src/Directory.Build.props  |   6 +-
 308 files changed, 3077 insertions(+), 3775 deletions(-)
 rename src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/{IListExtensions.cs => ICollectionExtensions.cs} (59%)
 create mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IJSRuntimeExtension.cs
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/JsRuntimeExtension.cs
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/AuthenticationService.cs
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/Contracts/IAuthenticationService.cs
 rename src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/{LocalizationDelegatingHandler.cs => RequestHeadersDelegationHandler.cs} (65%)
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/ChangePrerenderResponseStatusCode.cs
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/PageNotFound.razor
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/PageNotFound.razor.scss
 rename src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/{AuthController.cs => IdentityController.cs} (71%)
 rename src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/{20231114012959_InitialMigration.Designer.cs => 20231118003945_InitialMigration.Designer.cs} (96%)
 rename src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/{20231114012959_InitialMigration.cs => 20231118003945_InitialMigration.cs} (94%)
 create mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/AppIdentityErrorDescriber.cs
 create mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/AppSecureJwtDataFormat.cs
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/Contracts/IJwtService.cs
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/Contracts/IUserInformationProvider.cs
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/JwtService.cs
 delete mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/UserInformationProvider.cs
 create mode 100644 src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/RefreshRequestDto.cs
 rename src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/{SignInResponseDto.cs => TokenResponseDto.cs} (53%)
 create mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/Boilerplate.slnLaunch
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/{IListExtensions.cs => ICollectionExtensions.cs} (59%)
 create mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IJSRuntimeExtensions.Hybrid.cs
 create mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IJSRuntimeExtensions.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/JsRuntimeExtension.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/AuthenticationService.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/Contracts/IAuthenticationService.cs
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/{LocalizationDelegatingHandler.cs => RequestHeadersDelegationHandler.cs} (61%)
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/{AuthController.cs => IdentityController.cs} (71%)
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/{20231113190400_InitialMigration.Designer.cs => 20231121162004_InitialMigration.Designer.cs} (96%)
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/{20231113190400_InitialMigration.cs => 20231121162004_InitialMigration.cs} (94%)
 create mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/AppIdentityErrorDescriber.cs
 create mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/AppSecureJwtDataFormat.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/Contracts/IJwtService.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/Contracts/IUserInformationProvider.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/JwtService.cs
 delete mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/UserInformationProvider.cs
 create mode 100644 src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/RefreshRequestDto.cs
 rename src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/{SignInResponseDto.cs => TokenDto.cs} (58%)
 rename src/Websites/{Sales/src/Bit.Websites.Sales.Client/Extensions/JsRuntimeExtension.cs => Careers/src/Bit.Websites.Careers.Client/Extensions/IJSRuntimeExtension.cs} (93%)
 create mode 100644 src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
 delete mode 100644 src/Websites/Careers/src/Bit.Websites.Careers.Client/Shared/ChangePrerenderResponseStatusCode.cs
 rename src/Websites/{Careers/src/Bit.Websites.Careers.Client/Extensions/JsRuntimeExtension.cs => Platform/src/Bit.Websites.Platform.Client/Extensions/IJSRuntimeExtension.cs} (93%)
 create mode 100644 src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
 delete mode 100644 src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/ChangePrerenderResponseStatusCode.cs
 delete mode 100644 src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor
 delete mode 100644 src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor.cs
 delete mode 100644 src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor.scss
 rename src/Websites/{Platform/src/Bit.Websites.Platform.Client/Extensions/JsRuntimeExtension.cs => Sales/src/Bit.Websites.Sales.Client/Extensions/IJSRuntimeExtension.cs} (93%)
 create mode 100644 src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
 delete mode 100644 src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/ChangePrerenderResponseStatusCode.cs

diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/.azure-devops/workflows/cd.yml b/src/Templates/BlazorWeb/Bit.BlazorWeb/.azure-devops/workflows/cd.yml
index 469e56b680..acf0b68361 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/.azure-devops/workflows/cd.yml
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/.azure-devops/workflows/cd.yml
@@ -7,8 +7,8 @@ variables:
   APP_SERVICE_NAME: 'app-service-td-test'
   AZURE_SERVICE_CONNECTION: 'td-test-service-connection' # https://learn.microsoft.com/en-us/azure/devops/pipelines/library/service-endpoints?view=azure-devops&tabs=yaml#azure-resource-manager-service-connection
   ConnectionStrings.SqlServerConnectionString: $(DB_CONNECTION_STRING)
-  AppSettings.JwtSettings.IdentityCertificatePassword: $(API_IDENTITY_CERTIFICATE_PASSWORD)
-  # ApiServerAddress: 'api/'
+  AppSettings.IdentitySettings.IdentityCertificatePassword: $(API_IDENTITY_CERTIFICATE_PASSWORD)
+  ApiServerAddress: 'api/'
   # // You can also use absolute urls such as https://todob.bitplatform.dev/api/
 
 jobs:
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/.github/workflows/cd.yml b/src/Templates/BlazorWeb/Bit.BlazorWeb/.github/workflows/cd.yml
index f9b3680db7..47c4e6ed8e 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/.github/workflows/cd.yml
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/.github/workflows/cd.yml
@@ -33,6 +33,13 @@ jobs:
       with:
         node-version: 18
 
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'src/BlazorWeb.Client/appsettings.json'
+      env:
+        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
+
     - name: Install wasm
       run:  cd src && dotnet workload install wasm-tools wasm-experimental
 
@@ -84,7 +91,7 @@ jobs:
           files: 'appsettings.json'
         env:
           ConnectionStrings.SqlServerConnectionString: ${{ secrets.DB_CONNECTION_STRING }}
-          AppSettings.JwtSettings.IdentityCertificatePassword: ${{ secrets.API_IDENTITY_CERTIFICATE_PASSWORD }}
+          AppSettings.IdentitySettings.IdentityCertificatePassword: ${{ secrets.API_IDENTITY_CERTIFICATE_PASSWORD }}
 
       - name: Delete IdentityCertificate.pfx
         run: |
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/BlazorWeb.Client.csproj b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/BlazorWeb.Client.csproj
index b2c860cfa6..62c1a63c0d 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/BlazorWeb.Client.csproj
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/BlazorWeb.Client.csproj
@@ -4,8 +4,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
         <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
         <InvariantGlobalization Condition="'$(MultilingualEnabled)' == 'false'">true</InvariantGlobalization>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IListExtensions.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/ICollectionExtensions.cs
similarity index 59%
rename from src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IListExtensions.cs
rename to src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/ICollectionExtensions.cs
index 8f50eb4679..399d6b295f 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IListExtensions.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/ICollectionExtensions.cs
@@ -1,6 +1,6 @@
 namespace System.Collections.Generic;
 
-public static class IListExtensions
+public static class ICollectionExtensions
 {
     // Basically a Polyfill since we now expose IList instead of List
     // which is better but IList doesn't have AddRange
@@ -20,4 +20,14 @@ public static void AddRange<T>(this IList<T> list, IEnumerable<T> items)
             list.Add(item);
         }
     }
+
+    public static async Task<List<T>> ToListAsync<T>(this IAsyncEnumerable<T> items, CancellationToken cancellationToken = default)
+    {
+        var results = new List<T>();
+        await foreach (var item in items.WithCancellation(cancellationToken))
+        {
+            results.Add(item);
+        }
+        return results;
+    }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IJSRuntimeExtension.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IJSRuntimeExtension.cs
new file mode 100644
index 0000000000..1c78908da8
--- /dev/null
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IJSRuntimeExtension.cs
@@ -0,0 +1,73 @@
+using BlazorWeb.Shared.Dtos.Identity;
+
+namespace Microsoft.JSInterop;
+
+public static class IJSRuntimeExtensions
+{
+    /// <summary>
+    /// To disable the scrollbar of the body when showing the modal, so the modal can be always shown in the viewport without being scrolled out.
+    /// </summary>
+    public static async Task SetBodyOverflow(this IJSRuntime jsRuntime, bool hidden)
+    {
+        await jsRuntime.InvokeVoidAsync("App.setBodyOverflow", hidden);
+    }
+
+    public static async Task GoBack(this IJSRuntime jsRuntime)
+    {
+        await jsRuntime.InvokeVoidAsync("App.goBack");
+    }
+
+    public static async Task ApplyBodyElementClasses(this IJSRuntime jsRuntime, List<string> cssClasses, Dictionary<string, string> cssVariables)
+    {
+        await jsRuntime.InvokeVoidAsync("App.applyBodyElementClasses", cssClasses, cssVariables);
+    }
+
+    public static async Task SetCookie(this IJSRuntime jsRuntime, string key, string value, long expiresIn, bool rememberMe)
+    {
+        await jsRuntime.InvokeVoidAsync("App.setCookie", key, value, expiresIn, rememberMe);
+    }
+
+    public static async Task RemoveCookie(this IJSRuntime jsRuntime, string key)
+    {
+        await jsRuntime.InvokeVoidAsync("App.removeCookie", key);
+    }
+
+    public static async Task<string?> GetCookie(this IJSRuntime jsRuntime, string key)
+    {
+        return await jsRuntime.InvokeAsync<string?>("App.getCookie", key);
+    }
+
+    public static async Task SetLocalStorage(this IJSRuntime jsRuntime, string key, string value, bool rememberMe)
+    {
+        await jsRuntime.InvokeVoidAsync($"window.{(rememberMe ? "localStorage" : "sessionStorage")}.setItem", key, value);
+    }
+
+    public static async Task RemoveLocalStorage(this IJSRuntime jsRuntime, string key)
+    {
+        await jsRuntime.InvokeVoidAsync("window.sessionStorage.removeItem", key);
+        await jsRuntime.InvokeVoidAsync("window.localStorage.removeItem", key);
+    }
+
+    public static async Task<string?> GetLocalStorage(this IJSRuntime jsRuntime, string key)
+    {
+        return (await jsRuntime.InvokeAsync<string?>("window.localStorage.getItem", key)) ??
+            (await jsRuntime.InvokeAsync<string?>("window.sessionStorage.getItem", key));
+    }
+
+    public static async Task StoreAuthToken(this IJSRuntime jsRuntime, TokenResponseDto tokenResponse, bool? rememberMe = null)
+    {
+        if (rememberMe is null)
+        {
+            rememberMe = string.IsNullOrEmpty(await jsRuntime.InvokeAsync<string?>("window.localStorage.getItem", "refresh_token")) is false;
+        }
+
+        await jsRuntime.SetCookie("access_token", tokenResponse.AccessToken!, tokenResponse.ExpiresIn, rememberMe is true);
+        await jsRuntime.SetLocalStorage("refresh_token", tokenResponse.RefreshToken!, rememberMe is true);
+    }
+
+    public static async Task RemoveAuthTokens(this IJSRuntime jsRuntime)
+    {
+        await jsRuntime.RemoveCookie("access_token");
+        await jsRuntime.RemoveLocalStorage("refresh_token");
+    }
+}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IServiceCollectionExtensions.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IServiceCollectionExtensions.cs
index 1ccfa701d8..db230b04e9 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/IServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
 //-:cnd:noEmit
 using BlazorWeb.Client.Services.HttpMessageHandlers;
+using Microsoft.AspNetCore.Components.WebAssembly.Services;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -9,23 +10,23 @@ public static IServiceCollection AddClientSharedServices(this IServiceCollection
     {
         services.AddSharedServices();
 
-        services.AddCascadingAuthenticationState();
-        services.AddScoped<IPrerenderStateService, PrerenderStateService>();
-        services.AddScoped<IExceptionHandler, ExceptionHandler>();
+        services.AddTransient<IPrerenderStateService, PrerenderStateService>();
+        services.AddTransient<IExceptionHandler, ExceptionHandler>();
         services.AddScoped<IPubSubService, PubSubService>();
         services.AddBitBlazorUIServices();
 
-        services.AddTransient<LocalizationDelegatingHandler>();
+        services.AddTransient<RequestHeadersDelegationHandler>();
         services.AddTransient<AuthDelegatingHandler>();
         services.AddTransient<RetryDelegatingHandler>();
         services.AddTransient<ExceptionDelegatingHandler>();
         services.AddTransient<HttpClientHandler>();
 
         services.AddScoped<AuthenticationStateProvider, AppAuthenticationStateProvider>();
-        services.AddScoped<IAuthenticationService, AuthenticationService>();
         services.AddScoped(sp => (AppAuthenticationStateProvider)sp.GetRequiredService<AuthenticationStateProvider>());
 
-        services.AddScoped<MessageBoxService>();
+        services.AddTransient<MessageBoxService>();
+
+        services.AddTransient<LazyAssemblyLoader>();
 
         return services;
     }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/JsRuntimeExtension.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/JsRuntimeExtension.cs
deleted file mode 100644
index a279c37811..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Extensions/JsRuntimeExtension.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Microsoft.JSInterop;
-
-public static class JSRuntimeExtension
-{
-    /// <summary>
-    /// To disable the scrollbar of the body when showing the modal, so the modal can be always shown in the viewport without being scrolled out.
-    /// </summary>
-    public static async Task SetBodyOverflow(this IJSRuntime jsRuntime, bool hidden)
-    {
-        await jsRuntime.InvokeVoidAsync("App.setBodyOverflow", hidden);
-    }
-
-    public static async Task GoBack(this IJSRuntime jsRuntime)
-    {
-        await jsRuntime.InvokeVoidAsync("App.goBack");
-    }
-
-    public static async Task ApplyBodyElementClasses(this IJSRuntime jsRuntime, List<string> cssClasses, Dictionary<string, string> cssVariables)
-    {
-        await jsRuntime.InvokeVoidAsync("App.applyBodyElementClasses", cssClasses, cssVariables);
-    }
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/AddOrEditCategoryPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/AddOrEditCategoryPage.razor
index 7f950be30a..741e223d42 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/AddOrEditCategoryPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/AddOrEditCategoryPage.razor
@@ -54,8 +54,8 @@
 
         <div class="form-input-container">
             <BitLabel For="catColorInput">@Localizer[nameof(AppStrings.Color)]</BitLabel>
-                <div class="color-container">
-                    @foreach (var color in new[] { "#FFCD56", "#FF6384", "#4BC0C0", "#FF9124", "#2B88D8", "#C7E0F4" })
+            <div class="color-container">
+                @foreach (var color in new[] { "#FFCD56", "#FF6384", "#4BC0C0", "#FF9124", "#2B88D8", "#C7E0F4" })
                 {
                     <button @onclick="() => SetCategoryColor(color)"
                             class="color-btn @(_category.Color == color ? "color-btn--active" : null)"
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/CategoriesPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/CategoriesPage.razor.cs
index b01f116b35..6c7d7c4418 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/CategoriesPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/CategoriesPage.razor.cs
@@ -60,7 +60,7 @@ private void PrepareGridDataProvider()
 
                 var data = await HttpClient.GetFromJsonAsync(url, AppJsonContext.Default.PagedResultCategoryDto) ?? new();
 
-                return BitDataGridItemsProviderResult.From(data.Items!, (int)data.TotalCount);
+                return BitDataGridItemsProviderResult.From(await data.Items!.ToListAsync()!, (int)data.TotalCount);
             }
             catch (Exception exp)
             {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/DeleteAccountConfirmModal.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/DeleteAccountConfirmModal.razor.cs
index 063c14c3ef..6c9fb3acb0 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/DeleteAccountConfirmModal.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/DeleteAccountConfirmModal.razor.cs
@@ -18,7 +18,9 @@ private async Task DeleteAccount()
     {
         await HttpClient.DeleteAsync("User/Delete");
 
-        await AuthenticationService.SignOut();
+        await JSRuntime.RemoveAuthTokens();
+
+        await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
 
         await CloseModal();
     }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EditProfilePage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EditProfilePage.razor
index 47e58e3d58..e934cf2a2c 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EditProfilePage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EditProfilePage.razor
@@ -3,9 +3,9 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.EditProfileTitle)]</PageTitle>
 
-    <div class="page-container">
-        <div class="content-container profile-panel">
-            @if (string.IsNullOrEmpty(_editProfileMessage) is false)
+<div class="page-container">
+    <div class="content-container profile-panel">
+        @if (string.IsNullOrEmpty(_editProfileMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_editProfileMessageType"
@@ -45,16 +45,16 @@
                 }
 
                 <BitLabel>@Localizer[nameof(AppStrings.ProfileImage)]</BitLabel>
-                    <BitFileUpload @onfocus="() => _profileImageError = null"
-                                   Label="@Localizer[nameof(AppStrings.UploadNewProfileImage)]"
-                                   Accept="image/*"
-                                   AutoUploadEnabled="true"
-                                   UploadUrl="@_profileImageUploadUrl"
-                                   OnUploadComplete="WrapHandled(RefreshProfileData)"
-                                   OnUploadFailed="() => _profileImageError = Localizer[nameof(AppStrings.FileUploadFailed)]"
-                                   MaxSize="1024 * 1024 * 10"
-                                   ChunkedUploadEnabled="false" />
-                    <div class="form-input-error">@_profileImageError</div>
+                <BitFileUpload @onfocus="() => _profileImageError = null"
+                               Label="@Localizer[nameof(AppStrings.UploadNewProfileImage)]"
+                               Accept="image/*"
+                               AutoUploadEnabled="true"
+                               UploadUrl="@_profileImageUploadUrl"
+                               OnUploadComplete="WrapHandled(RefreshProfileData)"
+                               OnUploadFailed="() => _profileImageError = Localizer[nameof(AppStrings.FileUploadFailed)]"
+                               MaxSize="1024 * 1024 * 10"
+                               ChunkedUploadEnabled="false" />
+                <div class="form-input-error">@_profileImageError</div>
             </div>
 
             <EditForm Model="_userToEdit" OnValidSubmit="WrapHandled(DoSave)" class="edit-profile-form">
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EditProfilePage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EditProfilePage.razor.cs
index d38fc9d156..6f55d1f4ed 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EditProfilePage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EditProfilePage.razor.cs
@@ -43,16 +43,14 @@ protected override async Task OnInitAsync()
 
     private async Task LoadEditProfileData()
     {
-        _user = await PrerenderStateService.GetValue($"{nameof(EditProfilePage)}-{nameof(_user)}", GetCurrentUser) ?? new();
+        _user = await GetCurrentUser() ?? new();
 
         UpdateEditProfileData();
     }
 
     private async Task RefreshProfileData()
     {
-        _user = await GetCurrentUser() ?? new();
-
-        UpdateEditProfileData();
+        await LoadEditProfileData();
 
         PubSubService.Publish(PubSubMessages.PROFILE_UPDATED, _user);
     }
@@ -64,8 +62,7 @@ private void UpdateEditProfileData()
         _userToEdit.BirthDate = _user.BirthDate;
     }
 
-    private Task<UserDto?> GetCurrentUser() => HttpClient.GetFromJsonAsync("User/GetCurrentUser", AppJsonContext.Default.UserDto);
-
+    private Task<UserDto?> GetCurrentUser() => PrerenderStateService.GetValue($"{nameof(EditProfilePage)}-{nameof(_user)}", () => HttpClient.GetFromJsonAsync("User/GetCurrentUser", AppJsonContext.Default.UserDto));
 
     private async Task DoSave()
     {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EmailConfirmationPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EmailConfirmationPage.razor
index fee2629740..3931621843 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EmailConfirmationPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EmailConfirmationPage.razor
@@ -3,14 +3,14 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.EmailConfirmationTitle)]</PageTitle>
 
-    <div class="page-container">
-        <div class="form">
-            @if (string.IsNullOrEmpty(_emailConfirmationMessage) is false)
+<div class="page-container">
+    <div class="form">
+        @if (string.IsNullOrEmpty(_resendLinkErrors ?? Errors) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_emailConfirmationMessageType"
-                           OnDismiss="() => _emailConfirmationMessage = null">
-                @_emailConfirmationMessage
+                           OnDismiss="() => _resendLinkErrors = Errors = null">
+                @(_resendLinkErrors ?? Errors)
             </BitMessageBar>
         }
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EmailConfirmationPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EmailConfirmationPage.razor.cs
index c367377dda..3f1e602585 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EmailConfirmationPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/EmailConfirmationPage.razor.cs
@@ -3,16 +3,17 @@
 public partial class EmailConfirmationPage
 {
     private bool _isLoading;
-    private string? _emailConfirmationMessage;
-    private BitMessageBarType _emailConfirmationMessageType;
+    private string? _resendLinkErrors;
+    private BitMessageBarType _emailConfirmationMessageType = BitMessageBarType.Error;
 
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public string? Email { get; set; }
+    [SupplyParameterFromQuery, Parameter] public string? Email { get; set; }
 
-    [Parameter]
-    [SupplyParameterFromQuery(Name = "email-confirmed")]
-    public bool EmailConfirmed { get; set; }
+    /// <summary>
+    /// Email confirmation errors populated by api/Identity/ConfirmEmail endpoint.
+    /// </summary>
+    [SupplyParameterFromQuery, Parameter] public string? Errors { get; set; }
+
+    [SupplyParameterFromQuery(Name = "email-confirmed"), Parameter] public bool EmailConfirmed { get; set; }
 
     private void RedirectToSignIn()
     {
@@ -24,21 +25,21 @@ private async Task DoResendLink()
         if (_isLoading) return;
 
         _isLoading = true;
-        _emailConfirmationMessage = null;
+        _resendLinkErrors = Errors = null;
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/SendConfirmationEmail", new() { Email = Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/SendConfirmationEmail", new() { Email = Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto);
 
             _emailConfirmationMessageType = BitMessageBarType.Success;
 
-            _emailConfirmationMessage = Localizer[nameof(AppStrings.ResendConfirmationLinkMessage)];
+            _resendLinkErrors = Localizer[nameof(AppStrings.ResendConfirmationLinkMessage)];
         }
         catch (KnownException e)
         {
             _emailConfirmationMessageType = BitMessageBarType.Error;
 
-            _emailConfirmationMessage = e.Message;
+            _resendLinkErrors = e.Message;
         }
         finally
         {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ForgotPasswordPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ForgotPasswordPage.razor
index 26b5abfc12..5a1b065278 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ForgotPasswordPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ForgotPasswordPage.razor
@@ -3,11 +3,11 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.ForgetPasswordTitle)]</PageTitle>
 
-    <div class="page-container">
-        <EditForm Model="_forgotPasswordModel" OnValidSubmit="WrapHandled(DoSubmit)" class="form">
-            <AppDataAnnotationsValidator />
+<div class="page-container">
+    <EditForm Model="_forgotPasswordModel" OnValidSubmit="WrapHandled(DoSubmit)" class="form">
+        <AppDataAnnotationsValidator />
 
-            @if (string.IsNullOrEmpty(_forgotPasswordMessage) is false)
+        @if (string.IsNullOrEmpty(_forgotPasswordMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_forgotPasswordMessageType"
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ForgotPasswordPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ForgotPasswordPage.razor.cs
index d716b354e0..54d5f7e75d 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ForgotPasswordPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ForgotPasswordPage.razor.cs
@@ -18,7 +18,7 @@ private async Task DoSubmit()
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/SendResetPasswordEmail", _forgotPasswordModel, AppJsonContext.Default.SendResetPasswordEmailRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/SendResetPasswordEmail", _forgotPasswordModel, AppJsonContext.Default.SendResetPasswordEmailRequestDto);
 
             _forgotPasswordMessageType = BitMessageBarType.Success;
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ResetPasswordPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ResetPasswordPage.razor
index 90a6200435..08c75ab43a 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ResetPasswordPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ResetPasswordPage.razor
@@ -3,11 +3,11 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.ResetPasswordTitle)]</PageTitle>
 
-    <div class="page-container">
-        <EditForm Model="_resetPasswordModel" OnValidSubmit="WrapHandled(DoSubmit)" class="form">
-            <AppDataAnnotationsValidator />
+<div class="page-container">
+    <EditForm Model="_resetPasswordModel" OnValidSubmit="WrapHandled(DoSubmit)" class="form">
+        <AppDataAnnotationsValidator />
 
-            @if (string.IsNullOrEmpty(_resetPasswordMessage) is false)
+        @if (string.IsNullOrEmpty(_resetPasswordMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_resetPasswordMessageType"
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ResetPasswordPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ResetPasswordPage.razor.cs
index ac08c81501..6a8280e3eb 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ResetPasswordPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/ResetPasswordPage.razor.cs
@@ -29,7 +29,7 @@ protected override async Task OnAfterFirstRenderAsync()
     {
         await base.OnAfterFirstRenderAsync();
 
-        if (await AuthenticationStateProvider.IsUserAuthenticatedAsync())
+        if ((await AuthenticationStateTask).User.IsAuthenticated())
         {
             NavigationManager.NavigateTo("/");
         }
@@ -44,19 +44,11 @@ private async Task DoSubmit()
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/ResetPassword", _resetPasswordModel, AppJsonContext.Default.ResetPasswordRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/ResetPassword", _resetPasswordModel, AppJsonContext.Default.ResetPasswordRequestDto);
 
             _resetPasswordMessageType = BitMessageBarType.Success;
 
             _resetPasswordMessage = Localizer[nameof(AppStrings.PasswordChangedSuccessfullyMessage)];
-
-            await AuthenticationService.SignIn(new SignInRequestDto
-            {
-                UserName = Email,
-                Password = _resetPasswordModel.Password
-            });
-
-            NavigationManager.NavigateTo("/");
         }
         catch (KnownException e)
         {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignInPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignInPage.razor
index e2390cda67..d61e1e9cbe 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignInPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignInPage.razor
@@ -3,11 +3,11 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.SignInTitle)]</PageTitle>
 
-    <div class="page-container">
-        <EditForm OnValidSubmit="WrapHandled(DoSignIn)" class="form" Model="_signInModel">
-            <AppDataAnnotationsValidator />
+<div class="page-container">
+    <EditForm OnValidSubmit="WrapHandled(DoSignIn)" class="form" Model="_signInModel">
+        <AppDataAnnotationsValidator />
 
-            @if (string.IsNullOrEmpty(_signInMessage) is false)
+        @if (string.IsNullOrEmpty(_signInMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_signInMessageType"
@@ -36,6 +36,10 @@
             <ValidationMessage For="@(() => _signInModel.Password)" />
         </div>
 
+        <div class="form-input-container form-input-container--no-margin">
+            <BitCheckbox Class="form-checkbox" @bind-Value="_signInModel.RememberMe" Label="@Localizer[nameof(AppStrings.RememberMe)]" />
+        </div>
+
         <BitButton IsLoading="_isLoading"
                    Class="form-submit-button"
                    ButtonStyle="BitButtonStyle.Primary"
@@ -47,10 +51,10 @@
 
         <div class="form-forgot-password">
             <BitLink Href="/forgot-password">@Localizer[nameof(AppStrings.ForgotPasswordLink)]</BitLink>
-            </div>
+        </div>
 
-            <div>
-                @Localizer[nameof(AppStrings.DontHaveAccountMessage)] <BitLink Href="/sign-up">@Localizer[nameof(AppStrings.SignUp)]</BitLink>
-            </div>
-        </EditForm>
-    </div>
+        <div>
+            @Localizer[nameof(AppStrings.DontHaveAccountMessage)] <BitLink Href="/sign-up">@Localizer[nameof(AppStrings.SignUp)]</BitLink>
+        </div>
+    </EditForm>
+</div>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignInPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignInPage.razor.cs
index 4b80473d78..db25b7bfd1 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignInPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignInPage.razor.cs
@@ -9,15 +9,13 @@ public partial class SignInPage
     private BitMessageBarType _signInMessageType;
     private SignInRequestDto _signInModel = new();
 
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public string? RedirectUrl { get; set; }
+    [SupplyParameterFromQuery(Name = "redirect-url"), Parameter] public string? RedirectUrl { get; set; }
 
     protected override async Task OnAfterFirstRenderAsync()
     {
         await base.OnAfterFirstRenderAsync();
 
-        if (await AuthenticationStateProvider.IsUserAuthenticatedAsync())
+        if ((await AuthenticationStateTask).User.IsAuthenticated())
         {
             NavigationManager.NavigateTo("/");
         }
@@ -32,7 +30,12 @@ private async Task DoSignIn()
 
         try
         {
-            await AuthenticationService.SignIn(_signInModel);
+            var result = await (await HttpClient.PostAsJsonAsync("Identity/SignIn", _signInModel, AppJsonContext.Default.SignInRequestDto))
+                .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto);
+
+            await JSRuntime.StoreAuthToken(result!, _signInModel.RememberMe);
+
+            await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
 
             NavigationManager.NavigateTo(RedirectUrl ?? "/");
         }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor
index f6383c7aef..2d6c040c74 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor
@@ -3,11 +3,11 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.SingUpTitle)]</PageTitle>
 
-    <div class="page-container">
-        <EditForm Model="_signUpModel" OnValidSubmit="WrapHandled(DoSignUp)" class="form">
-            <AppDataAnnotationsValidator />
+<div class="page-container">
+    <EditForm Model="_signUpModel" OnValidSubmit="WrapHandled(DoSignUp)" class="form">
+        <AppDataAnnotationsValidator />
 
-            @if (string.IsNullOrEmpty(_signUpMessage) is false)
+        @if (string.IsNullOrEmpty(_signUpMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_signUpMessageType"
@@ -46,7 +46,7 @@
             <br />
             <div>
                 <BitLink Href="/sign-in">@Localizer[nameof(AppStrings.SignIn)]</BitLink>
-                </div>
+            </div>
         }
         else
         {
@@ -76,10 +76,10 @@
                 <BitCheckbox Class="form-checkbox" @bind-Value="_signUpModel.TermsAccepted">
                     <LabelTemplate>
                         <span>@Localizer[nameof(AppStrings.TermsMessage)]&nbsp<BitLink Href="/terms">@Localizer[nameof(AppStrings.TermsTitle)]</BitLink></span>
-                        </LabelTemplate>
-                    </BitCheckbox>
-                    <ValidationMessage For="@(() => _signUpModel.TermsAccepted)" />
-                </div>
+                    </LabelTemplate>
+                </BitCheckbox>
+                <ValidationMessage For="@(() => _signUpModel.TermsAccepted)" />
+            </div>
 
             <BitButton IsLoading="_isLoading"
                        Class="form-submit-button"
@@ -92,7 +92,7 @@
 
             <div>
                 @Localizer[nameof(AppStrings.AlreadyHaveAccountMessage)] <BitLink Href="/sign-in">@Localizer[nameof(AppStrings.SignIn)]</BitLink>
-                </div>
+            </div>
         }
 
     </EditForm>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.cs
index 47f52032e8..f2d80d7268 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.cs
@@ -15,7 +15,7 @@ protected override async Task OnAfterFirstRenderAsync()
     {
         await base.OnAfterFirstRenderAsync();
 
-        if (await AuthenticationStateProvider.IsUserAuthenticatedAsync())
+        if ((await AuthenticationStateTask).User.IsAuthenticated())
         {
             NavigationManager.NavigateTo("/");
         }
@@ -30,7 +30,7 @@ private async Task DoSignUp()
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/SignUp", _signUpModel, AppJsonContext.Default.SignUpRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/SignUp", _signUpModel, AppJsonContext.Default.SignUpRequestDto);
 
             _isSignedUp = true;
         }
@@ -59,7 +59,7 @@ private async Task DoResendLink()
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/SendConfirmationEmail", new() { Email = _signUpModel.Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/SendConfirmationEmail", new() { Email = _signUpModel.Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto);
 
             _signUpMessageType = BitMessageBarType.Success;
             _signUpMessage = Localizer[nameof(AppStrings.ResendConfirmationLinkMessage)];
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor
index e548080d47..f91aec8569 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor
@@ -2,11 +2,9 @@
 
 @inherits AppComponentBase
 
-<ChangePrerenderResponseStatusCode StatusCode="System.Net.HttpStatusCode.Unauthorized" />
-
 <AuthorizeView>
     <div class="main">
-        <div><img src="_content/BlazorWeb.Client/images/icons/error-triangle.svg" /></div>
+        <div><img src="images/icons/error-triangle.svg" /></div>
         <h2 class="title">@Localizer[nameof(AppStrings.ForbiddenException)]</h2>
         <h4 class="description">@Localizer[nameof(AppStrings.YouAreSignInAs)] @_user.GetUserName()</h4>
         <div class="buttons">
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor.cs
index 6d46e0bcf5..331504e22d 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor.cs
@@ -4,43 +4,61 @@ public partial class NotAuthorizedPage
 {
     private ClaimsPrincipal _user { get; set; } = default!;
 
-    [SupplyParameterFromQuery, Parameter] public string? RedirectUrl { get; set; }
+    [SupplyParameterFromQuery(Name = "redirect-url"), Parameter] public string? RedirectUrl { get; set; }
 
-    [CascadingParameter] private Task<AuthenticationState> _authenticationStateTask { get; set; } = default!;
-
-    protected async override Task OnParamsSetAsync()
+    protected override async Task OnParamsSetAsync()
     {
-        _user = (await _authenticationStateTask).User;
+        _user = (await AuthenticationStateTask).User;
 
         await base.OnParamsSetAsync();
     }
 
-    protected override void OnAfterRender(bool firstRender)
+    protected override async Task OnAfterFirstRenderAsync()
     {
-        try
+        string? refresh_token = await JSRuntime.GetLocalStorage("refresh_token");
+
+        // Let's update the access token by refreshing it when a refresh token is available.
+        // Following this procedure, the newly acquired access token may now include the necessary roles or claims.
+        // To prevent infinitie redirect loop, let's append refresh_token=false to the url, so we only redirect in case no refresh_token=false is present
+
+        if (string.IsNullOrEmpty(refresh_token) is false && RedirectUrl?.Contains("refresh_token=false", StringComparison.InvariantCulture) is null or false)
         {
-            if (firstRender && _user.Identity?.IsAuthenticated is false)
+            // In the AuthenticationStateProvider, the access_token is refreshed using the refresh_token (if available).
+            // To ensure this process, consider removing the access_token, prompting the AuthenticationStateProvider to initiate a refresh automatically.
+            await JSRuntime.RemoveCookie("access_token");
+            await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
+
+            if ((await AuthenticationStateTask).User.IsAuthenticated())
             {
-                RedirectToSignInPage();
+                if (RedirectUrl is not null)
+                {
+                    var @char = RedirectUrl.Contains('?') ? '&' : '?'; // The RedirectUrl may already include a query string.
+                    NavigationManager.NavigateTo($"{RedirectUrl}{@char}refresh_token=false");
+                }
             }
         }
-        catch (Exception exp)
+
+        if ((await AuthenticationStateTask).User.IsAuthenticated() is false)
         {
-            ExceptionHandler.Handle(exp);
+            // If neither the refresh_token nor the access_token is present, proceed to the sign-in page.
+            await SignIn();
         }
 
-        base.OnAfterRender(firstRender);
+        await base.OnAfterFirstRenderAsync();
     }
 
     private async Task SignIn()
     {
-        await AuthenticationService.SignOut();
+        await JSRuntime.RemoveAuthTokens();
 
+        await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
+        
         RedirectToSignInPage();
     }
 
     private void RedirectToSignInPage()
     {
-        NavigationManager.NavigateTo($"/sign-in?redirectUrl={RedirectUrl ?? NavigationManager.ToBaseRelativePath(NavigationManager.Uri)}");
+        var redirectUrl = RedirectUrl ?? NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
+        NavigationManager.NavigateTo($"/sign-in{(string.IsNullOrEmpty(redirectUrl) ? "" : $"?redirect-url={redirectUrl}")}");
     }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotFoundPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotFoundPage.razor
index 4319f1bc40..ff2a8b07d2 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotFoundPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotFoundPage.razor
@@ -2,8 +2,6 @@
 
 @inherits AppComponentBase
 
-<ChangePrerenderResponseStatusCode StatusCode="System.Net.HttpStatusCode.NotFound" />
-
 <div class="main">
     <h1 class="title">404</h1>
     <div class="description">There is nothing here.</div>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor
index 1bf343bb8c..7350a04531 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor
@@ -16,7 +16,7 @@
         <h1 class="page-title">@Localizer[nameof(AppStrings.Products)]</h1>
         <BitButton OnClick="WrapHandled(CreateProduct)">@Localizer[nameof(AppStrings.AddProduct)]</BitButton>
     </div>
-    
+
     <div class="grid">
         <BitDataGrid @ref="_dataGrid" ItemsProvider="_productsProvider" TGridItem="ProductDto" ResizableColumns="true" Pagination="_pagination">
             <BitDataGridPropertyColumn Title="@Localizer[nameof(AppStrings.Id)]" Property="p => p!.Id" Sortable="true" Class="id-col"
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor.cs
index 6b80cbc749..47fbc747cc 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor.cs
@@ -61,7 +61,7 @@ private void PrepareGridDataProvider()
 
                 var data = await HttpClient.GetFromJsonAsync(url, AppJsonContext.Default.PagedResultProductDto);
 
-                return BitDataGridItemsProviderResult.From(data!.Items!, (int)data!.TotalCount);
+                return BitDataGridItemsProviderResult.From(await data!.Items!.ToListAsync(), (int)data!.TotalCount);
             }
             catch (Exception exp)
             {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/TermsPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/TermsPage.razor
index 9fab1351d9..ff0c4c6236 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/TermsPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/TermsPage.razor
@@ -7,18 +7,18 @@
     <div class="page-content">
 
         <section class="main-section">
-                <h1 class="main-section-title">BlazorWeb license</h1>
+            <h1 class="main-section-title">BlazorWeb license</h1>
             <div class="section-desc">
-                    This EULA and Privacy Policy are written for individuals who use the BlazorWeb Demo Version through the <BitLink Href="https://todo.bitplatform.dev" Target="_blank">todo.bitplatform.dev</BitLink> website, or the published version of this app on the bit platform's Google Play, Apple Store, and Microsoft Store accounts.
+                This EULA and Privacy Policy are written for individuals who use the BlazorWeb Demo Version through the <BitLink Href="https://todo.bitplatform.dev" Target="_blank">todo.bitplatform.dev</BitLink> website, or the published version of this app on the bit platform's Google Play, Apple Store, and Microsoft Store accounts.
                 <br />
                 If you want to build your own project based on this Project Template, please refer to the <BitLink Href="https://github.com/bitfoundation/bitplatform/blob/develop/LICENSE" Target="_blank">License</BitLink> and create your own project, publish it with the relevant EULA and Privacy Policy for your business.s
             </div>
         </section>
 
         <section class="sub-section">
-                <h2 class="sub-section-title">End-User License Agreement (EULA) for BlazorWeb Demo Version</h2>
+            <h2 class="sub-section-title">End-User License Agreement (EULA) for BlazorWeb Demo Version</h2>
             <div class="section-desc">
-                    This End-User License Agreement (EULA) is a legal agreement between you (the "user") and bit platform, located at Sixmastraat 15, 8932 PA Leeuwarden, Netherlands, with phone number <BitLink Href="tel:+31684207362">+31684207362</BitLink>, for the use of BlazorWeb Demo Version (the "Software").
+                This End-User License Agreement (EULA) is a legal agreement between you (the "user") and bit platform, located at Sixmastraat 15, 8932 PA Leeuwarden, Netherlands, with phone number <BitLink Href="tel:+31684207362">+31684207362</BitLink>, for the use of BlazorWeb Demo Version (the "Software").
                 <br />
                 By using the Software, you agree to be bound by the terms and conditions of this agreement.
             </div>
@@ -27,7 +27,7 @@
         <section class="sub-section">
             <h2 class="sub-section-title">License Grant</h2>
             <div class="section-desc">
-                    bit platform hereby grants the user a non-exclusive, non-transferable license to use the Software, solely for the purpose of evaluating and testing the features of the BlazorWeb Demo Version during the term of this EULA.
+                bit platform hereby grants the user a non-exclusive, non-transferable license to use the Software, solely for the purpose of evaluating and testing the features of the BlazorWeb Demo Version during the term of this EULA.
             </div>
         </section>
 
@@ -41,7 +41,7 @@
         <section class="sub-section">
             <h2 class="sub-section-title">User Data</h2>
             <div class="section-desc">
-                    bit platform may collect user data, including name, surname, photo, date of birth, and gender. Providing this information is optional, and bit platform will only use it for the purposes of the BlazorWeb Demo Version. If the user requests, bit platform will delete this data within one day, using one of the contact methods provided at the end of this EULA. In addition, the user is required to provide an email address for account verification purposes, but bit platform will not use this email for any other purposes.
+                bit platform may collect user data, including name, surname, photo, date of birth, and gender. Providing this information is optional, and bit platform will only use it for the purposes of the BlazorWeb Demo Version. If the user requests, bit platform will delete this data within one day, using one of the contact methods provided at the end of this EULA. In addition, the user is required to provide an email address for account verification purposes, but bit platform will not use this email for any other purposes.
             </div>
         </section>
 
@@ -93,10 +93,10 @@
             <div class="section-desc">
                 <ul>
                     <li>bit platform is committed to protecting the privacy of the user data.</li>
-                        <li>We will only use the data collected from the user for the purposes of the BlazorWeb Demo Version and will delete this data upon user request, using one of the contact methods provided above.</li>
+                    <li>We will only use the data collected from the user for the purposes of the BlazorWeb Demo Version and will delete this data upon user request, using one of the contact methods provided above.</li>
                     <li>We do not share the user data with any third parties and do not allow users to share data with anyone in any way.</li>
-                        <li>We do not collect any information on user's usage in the BlazorWeb Demo Version.</li>
-                        <li>We do not display any Third-Party content, advertisements, or any purchases in the BlazorWeb Demo Version.</li>
+                    <li>We do not collect any information on user's usage in the BlazorWeb Demo Version.</li>
+                    <li>We do not display any Third-Party content, advertisements, or any purchases in the BlazorWeb Demo Version.</li>
                     <li>This Privacy Policy is effective until 2025-12-31 and is subject to change without notice.</li>
                 </ul>
             </div>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Todo/TodoPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Todo/TodoPage.razor
index 65174660df..0a8650cb9f 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Todo/TodoPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Todo/TodoPage.razor
@@ -3,16 +3,16 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.TodoTitle)]</PageTitle>
 
-    <div class="page-container">
-        <div class="search-box-container">
-            <BitSearchBox Style="width: 300px"
-                          OnChange="SearchTodoItems"
-                          OnClear="@(() => SearchTodoItems(""))"
-                          Placeholder="@Localizer[nameof(AppStrings.TodoSearchPlaceholder)]" />
-        </div>
+<div class="page-container">
+    <div class="search-box-container">
+        <BitSearchBox Style="width: 300px"
+                      OnChange="SearchTodoItems"
+                      OnClear="@(() => SearchTodoItems(""))"
+                      Placeholder="@Localizer[nameof(AppStrings.TodoSearchPlaceholder)]" />
+    </div>
 
-        <div class="todo-content">
-            <h1 class="main-title">@Localizer[nameof(AppStrings.TodoTitle)]</h1>
+    <div class="todo-content">
+        <h1 class="main-title">@Localizer[nameof(AppStrings.TodoTitle)]</h1>
         <div class="add-todo-container">
             <BitTextField @bind-Value="_newTodoTitle"
                           Placeholder="@Localizer[nameof(AppStrings.TodoAddPlaceholder)]"
@@ -61,7 +61,7 @@
                         <div class="todo-list--empty-state">
                             <img src="/images/backgrounds/empty-todo-list-bg.svg">
                             <BitLabel>@Localizer[nameof(AppStrings.NoTodos)]</BitLabel>
-                            </div>
+                        </div>
                     }
                     else
                     {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Program.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Program.cs
index 1c7d6baf36..a8d8bf999a 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Program.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Program.cs
@@ -12,8 +12,7 @@
     apiServerAddress = new Uri($"{builder.HostEnvironment.BaseAddress}{apiServerAddress}");
 }
 
-builder.Services.AddSingleton(sp => new HttpClient(sp.GetRequiredService<LocalizationDelegatingHandler>()) { BaseAddress = apiServerAddress });
-builder.Services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();
+builder.Services.AddTransient(sp => new HttpClient(sp.GetRequiredService<RequestHeadersDelegationHandler>()) { BaseAddress = apiServerAddress });
 builder.Services.AddTransient<IAuthTokenProvider, ClientSideAuthTokenProvider>();
 
 builder.Services.AddClientSharedServices();
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Scripts/app.ts b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Scripts/app.ts
index 3009cd6273..bcf2925db0 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Scripts/app.ts
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Scripts/app.ts
@@ -1,8 +1,12 @@
 class App {
-    public static setCookie(name: string, value: string, seconds: number) {
+    public static setCookie(name: string, value: string, seconds: number, remeber: boolean) {
         const date = new Date();
         date.setSeconds(date.getSeconds() + seconds);
-        document.cookie = `${name}=${value};expires=${date.toUTCString()};path=/;samesite=strict;`;
+        let cookie = `${name}=${value};path=/;samesite=strict;`;
+        if (remeber == true) {
+            cookie = cookie += `expires=${date.toUTCString()};`;
+        }
+        document.cookie = cookie;
     }
 
     public static getCookie(name: string): string | null {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/AppAuthenticationStateProvider.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/AppAuthenticationStateProvider.cs
index 02927b710d..89783e0923 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/AppAuthenticationStateProvider.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/AppAuthenticationStateProvider.cs
@@ -6,6 +6,8 @@ namespace BlazorWeb.Client.Services;
 public partial class AppAuthenticationStateProvider : AuthenticationStateProvider
 {
     [AutoInject] private IAuthTokenProvider _tokenProvider = default!;
+    [AutoInject] private HttpClient _httpClient = default;
+    [AutoInject] private IJSRuntime _jsRuntime = default!;
 
     public async Task RaiseAuthenticationStateHasChanged()
     {
@@ -16,18 +18,31 @@ public override async Task<AuthenticationState> GetAuthenticationStateAsync()
     {
         var access_token = await _tokenProvider.GetAccessTokenAsync();
 
-        if (string.IsNullOrWhiteSpace(access_token)) return NotSignedIn();
+        if (string.IsNullOrEmpty(access_token) && _tokenProvider.IsInitialized)
+        {
+            string? refresh_token = await _jsRuntime.GetLocalStorage("refresh_token");
+
+            if (string.IsNullOrEmpty(refresh_token) is false)
+            {
+                var refreshTokenResponse = await (await _httpClient.PostAsJsonAsync("Identity/Refresh", new() { RefreshToken = refresh_token }, AppJsonContext.Default.RefreshRequestDto))
+                    .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto);
+
+                await _jsRuntime.StoreAuthToken(refreshTokenResponse!);
+
+                access_token = refreshTokenResponse!.AccessToken;
+            }
+        }
+
+        if (string.IsNullOrEmpty(access_token))
+        {
+            return NotSignedIn();
+        }
 
         var identity = new ClaimsIdentity(claims: ParseTokenClaims(access_token), authenticationType: "Bearer", nameType: "name", roleType: "role");
 
         return new AuthenticationState(new ClaimsPrincipal(identity));
     }
 
-    public async Task<bool> IsUserAuthenticatedAsync()
-    {
-        return (await GetAuthenticationStateAsync()).User.Identity?.IsAuthenticated == true;
-    }
-
     private static AuthenticationState NotSignedIn()
     {
         return new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity()));
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/AuthenticationService.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/AuthenticationService.cs
deleted file mode 100644
index f67012e2e8..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/AuthenticationService.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//-:cnd:noEmit
-using BlazorWeb.Shared.Dtos.Identity;
-
-namespace BlazorWeb.Client.Services;
-
-public partial class AuthenticationService : IAuthenticationService
-{
-    [AutoInject] private HttpClient _httpClient = default!;
-
-    [AutoInject] private IJSRuntime _jsRuntime = default!;
-
-    [AutoInject] private AppAuthenticationStateProvider _authenticationStateProvider = default!;
-
-    public async Task SignIn(SignInRequestDto dto)
-    {
-        var result = await (await _httpClient.PostAsJsonAsync("Auth/SignIn", dto, AppJsonContext.Default.SignInRequestDto))
-            .Content.ReadFromJsonAsync(AppJsonContext.Default.SignInResponseDto);
-
-        await _jsRuntime.InvokeVoidAsync("App.setCookie", "access_token", result!.AccessToken, result.ExpiresIn);
-
-        await _authenticationStateProvider.RaiseAuthenticationStateHasChanged();
-    }
-
-    public async Task SignOut()
-    {
-        await _jsRuntime.InvokeVoidAsync("App.removeCookie", "access_token");
-
-        await _authenticationStateProvider.RaiseAuthenticationStateHasChanged();
-    }
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/ClientSideAuthTokenProvider.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/ClientSideAuthTokenProvider.cs
index 8f2dfb01da..6d7255f9aa 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/ClientSideAuthTokenProvider.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/ClientSideAuthTokenProvider.cs
@@ -5,8 +5,10 @@ public partial class ClientSideAuthTokenProvider : IAuthTokenProvider
 {
     [AutoInject] private IJSRuntime _jsRuntime = default!;
 
+    public bool IsInitialized => true;
+
     public async Task<string?> GetAccessTokenAsync()
     {
-        return await _jsRuntime.InvokeAsync<string>("App.getCookie", "access_token");
+        return await _jsRuntime.GetCookie("access_token");
     }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/Contracts/IAuthenticationService.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/Contracts/IAuthenticationService.cs
deleted file mode 100644
index 84318db73b..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/Contracts/IAuthenticationService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using BlazorWeb.Shared.Dtos.Identity;
-
-namespace BlazorWeb.Client.Services.Contracts;
-
-public interface IAuthenticationService
-{
-    Task SignIn(SignInRequestDto dto);
-
-    Task SignOut();
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/Contracts/IPubSubService.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/Contracts/IPubSubService.cs
index 333d4ae5d9..8f84e48cdc 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/Contracts/IPubSubService.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/Contracts/IPubSubService.cs
@@ -6,5 +6,5 @@
 public interface IPubSubService
 {
     void Publish(string message, object? payload);
-    Action Subscribe(string message, Action<object?> handler);
+    Action Subscribe(string message, Func<object?, Task> handler);
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/ExceptionHandler.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/ExceptionHandler.cs
index 8809ca20aa..a543328178 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/ExceptionHandler.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/ExceptionHandler.cs
@@ -6,46 +6,22 @@ namespace BlazorWeb.Client.Services;
 public partial class ExceptionHandler : IExceptionHandler
 {
     [AutoInject] IStringLocalizer<AppStrings> _localizer = default!;
-    [AutoInject] IAuthenticationService _authenticationService = default!;
     [AutoInject] MessageBoxService _messageBoxService = default!;
 
     public void Handle(Exception exception, IDictionary<string, object?>? parameters = null)
     {
-        if (exception is UnauthorizedException)
-        {
-            SignOut();
-
-            return;
-        }
+        string exceptionMessage = (exception as KnownException)?.Message ??
+#if DEBUG
+            exception.ToString();
+#else
+            _localizer[nameof(AppStrings.UnknownException)];
+#endif
 
 #if DEBUG
-        string exceptionMessage = (exception as KnownException)?.Message ?? exception.ToString();
-        _ = _messageBoxService.Show(exceptionMessage, _localizer[nameof(AppStrings.Error)]);
         _ = Console.Out.WriteLineAsync(exceptionMessage);
         Debugger.Break();
-#else
-        if (exception is KnownException knownException)
-        {
-            _ = _messageBoxService.Show(knownException.Message, _localizer[nameof(AppStrings.Error)]);
-        }
-        else
-        {
-            _ = _messageBoxService.Show(_localizer[nameof(AppStrings.UnknownException)], _localizer[nameof(AppStrings.Error)]);
-        }
 #endif
-    }
 
-    private async void SignOut()
-    {
-        try
-        {
-            await _messageBoxService.Show(_localizer[nameof(AppStrings.YouNeedToSignIn)], _localizer[nameof(AppStrings.Error)]);
-
-            await _authenticationService.SignOut();
-        }
-        catch (Exception exp)
-        {
-            Handle(exp);
-        }
+        _ = _messageBoxService.Show(exceptionMessage, _localizer[nameof(AppStrings.Error)]);
     }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/AuthDelegatingHandler.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
index d0d2afe1c6..8f682211de 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
@@ -1,35 +1,24 @@
-using System.Net.Http.Headers;
+using System;
+using System.Net.Http.Headers;
+using BlazorWeb.Shared.Dtos.Identity;
 
 namespace BlazorWeb.Client.Services.HttpMessageHandlers;
 
-public class AuthDelegatingHandler
-    : DelegatingHandler
+public class AuthDelegatingHandler(IAuthTokenProvider tokenProvider, IServiceProvider serviceProvider, IJSRuntime jsRuntime, RetryDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    private IAuthTokenProvider _tokenProvider = default!;
-    private IJSRuntime _jsRuntime = default!;
-
-    public AuthDelegatingHandler(IAuthTokenProvider tokenProvider, IJSRuntime jsRuntime, RetryDelegatingHandler handler)
-        : base(handler)
-    {
-        _tokenProvider = tokenProvider;
-        _jsRuntime = jsRuntime;
-    }
-
-    public AuthDelegatingHandler(IAuthTokenProvider tokenProvider, IJSRuntime jsRuntime)
-        : base()
-    {
-        _tokenProvider = tokenProvider;
-        _jsRuntime = jsRuntime;
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         if (request.Headers.Authorization is null)
         {
-            var access_token = await _tokenProvider.GetAccessTokenAsync();
-            if (access_token is not null)
+            if (OperatingSystem.IsBrowser() is false)
             {
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token);
+                // Browsers automatically send cookies, yet we still require access_token for pre-rendering purposes.
+                var access_token = await tokenProvider.GetAccessTokenAsync();
+                if (access_token is not null)
+                {
+                    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token);
+                }
             }
         }
 
@@ -37,10 +26,41 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
         {
             return await base.SendAsync(request, cancellationToken);
         }
-        catch (UnauthorizedException)
+        catch (Exception _) when ((_ is ForbiddenException or UnauthorizedException) && tokenProvider.IsInitialized)
         {
-            // try to get refresh token, store access token and refresh token,
-            // then use the new access token to request's authorization header and call base.SendAsync again.
+            // Notes about ForbiddenException:
+            // Let's update the access token by refreshing it when a refresh token is available.
+            // Following this procedure, the newly acquired access token may now include the necessary roles or claims.
+
+            var refresh_token = await jsRuntime.GetLocalStorage("refresh_token");
+
+            if (refresh_token is not null)
+            {
+                var httpClient = serviceProvider.GetRequiredService<HttpClient>();
+                var appAuthStateProvider = serviceProvider.GetRequiredService<AppAuthenticationStateProvider>();
+
+                try
+                {
+                    var refreshTokenResponse = await (await httpClient.PostAsJsonAsync("Identity/Refresh", new RefreshRequestDto { RefreshToken = refresh_token }, AppJsonContext.Default.RefreshRequestDto, cancellationToken))
+                        .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto, cancellationToken);
+
+                    await jsRuntime.StoreAuthToken(refreshTokenResponse!);
+
+                    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", refreshTokenResponse!.AccessToken);
+                }
+                catch (ResourceValidationException exp) /* refresh_token is expired */
+                {
+                    await jsRuntime.RemoveAuthTokens();
+                    throw new UnauthorizedException(nameof(AppStrings.YouNeedToSignIn), exp);
+                }
+                finally
+                {
+                    await appAuthStateProvider.RaiseAuthenticationStateHasChanged();
+                }
+
+                return await base.SendAsync(request, cancellationToken);
+            }
+
             throw;
         }
     }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
index 309f56bcf9..4436eb1950 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
@@ -2,20 +2,9 @@
 
 namespace BlazorWeb.Client.Services.HttpMessageHandlers;
 
-public class ExceptionDelegatingHandler
-    : DelegatingHandler
+public class ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
+    : DelegatingHandler(httpClientHandler)
 {
-    public ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
-        : base(httpClientHandler)
-    {
-
-    }
-
-    public ExceptionDelegatingHandler()
-    {
-
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         bool serverCommunicationSuccess = false;
@@ -26,11 +15,6 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
             serverCommunicationSuccess = true;
 
-            if (response.StatusCode is HttpStatusCode.Unauthorized)
-            {
-                throw new UnauthorizedException();
-            }
-
             if (response.IsSuccessStatusCode is false && response.Content.Headers.ContentType?.MediaType?.Contains("application/json", StringComparison.InvariantCultureIgnoreCase) is true)
             {
                 if (response.Headers.TryGetValues("Request-ID", out IEnumerable<string>? values) && values is not null && values.Any())
@@ -52,6 +36,15 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 }
             }
 
+            if (response.StatusCode is HttpStatusCode.Unauthorized)
+            {
+                throw new UnauthorizedException(AppStrings.YouNeedToSignIn);
+            }
+            if (response.StatusCode is HttpStatusCode.Forbidden)
+            {
+                throw new ForbiddenException(AppStrings.ForbiddenException);
+            }
+
             response.EnsureSuccessStatusCode();
 
             return response;
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/LocalizationDelegatingHandler.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
similarity index 65%
rename from src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/LocalizationDelegatingHandler.cs
rename to src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
index 03f055e66e..786739c6a2 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/LocalizationDelegatingHandler.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
@@ -1,23 +1,15 @@
 using System.Net.Http.Headers;
+using Microsoft.AspNetCore.Components.WebAssembly.Http;
 
 namespace BlazorWeb.Client.Services.HttpMessageHandlers;
 
-public class LocalizationDelegatingHandler
-    : DelegatingHandler
+public class RequestHeadersDelegationHandler(AuthDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    public LocalizationDelegatingHandler(AuthDelegatingHandler handler) 
-        : base(handler)
-    {
-
-    }
-
-    public LocalizationDelegatingHandler()
-    {
-
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
+        request.SetBrowserResponseStreamingEnabled(true);
+
 #if MultilingualEnabled
         request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(CultureInfo.CurrentCulture.Name));
 #endif
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
index 181f77ef90..be68dff7ff 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
@@ -1,19 +1,8 @@
 namespace BlazorWeb.Client.Services.HttpMessageHandlers;
 
-public class RetryDelegatingHandler
-    : DelegatingHandler
+public class RetryDelegatingHandler(ExceptionDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    public RetryDelegatingHandler(ExceptionDelegatingHandler handler)
-        : base(handler)
-    {
-
-    }
-
-    public RetryDelegatingHandler()
-    {
-
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         var delays = GetDelays(scaleFirstTry: TimeSpan.FromSeconds(3), maxRetries: 3).ToArray();
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/PrerenderStateService.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/PrerenderStateService.cs
index 0cb6c5815e..45d4879d14 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/PrerenderStateService.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/PrerenderStateService.cs
@@ -1,7 +1,5 @@
 //-:cnd:noEmit
 
-using Microsoft.AspNetCore.Components.Web;
-
 namespace BlazorWeb.Client.Services;
 
 // Using this class, persisting the application state on Pre-Rendering mode (explained here: https://docs.microsoft.com/en-us/aspnet/core/blazor/components/prerendering-and-integration#persist-prerendered-state) will be very simple in this multi-mode Template project.
@@ -15,11 +13,7 @@ public class PrerenderStateService : IPrerenderStateService, IAsyncDisposable
     public PrerenderStateService(PersistentComponentState applicationState)
     {
         _applicationState = applicationState;
-
-        if (OperatingSystem.IsBrowser() is false)
-        {
-            _subscription = applicationState.RegisterOnPersisting(PersistAsJson, RenderModeProvider.Current);
-        }
+        _subscription = applicationState.RegisterOnPersisting(PersistAsJson, RenderModeProvider.Current);
     }
 
     public async Task<T?> GetValue<T>(string key, Func<Task<T?>> factory)
@@ -33,16 +27,12 @@ public PrerenderStateService(PersistentComponentState applicationState)
 
     void Persist<T>(string key, T value)
     {
-        if (OperatingSystem.IsBrowser())
-            return;
         _values.TryRemove(key, out object? _);
         _values.TryAdd(key, value);
     }
 
     async Task PersistAsJson()
     {
-        if (OperatingSystem.IsBrowser())
-            return;
         foreach (var item in _values)
             _applicationState.PersistAsJson(item.Key, item.Value);
     }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/PubSubService.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/PubSubService.cs
index d2467daa04..ffbd0a4718 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/PubSubService.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/PubSubService.cs
@@ -3,19 +3,25 @@
 /// <summary>
 /// For more information <see cref="IPubSubService"/> docs.
 /// </summary>
-public class PubSubService : IPubSubService
+public partial class PubSubService : IPubSubService
 {
-    private readonly ConcurrentDictionary<string, List<Action<object?>>> _handlers = new();
+    [AutoInject] private IServiceProvider _serviceProvider = default!;
+
+    private readonly ConcurrentDictionary<string, List<Func<object?, Task>>> _handlers = new();
 
     public void Publish(string message, object? payload)
     {
         if (_handlers.TryGetValue(message, out var handlers))
         {
-            handlers.ForEach(handler => handler(payload));
+            foreach (var handler in handlers)
+            {
+                handler(payload)
+                    .ContinueWith(t => _serviceProvider.GetRequiredService<IExceptionHandler>().Handle(t.Exception!), TaskContinuationOptions.OnlyOnFaulted);
+            }
         }
     }
 
-    public Action Subscribe(string message, Action<object?> handler)
+    public Action Subscribe(string message, Func<object?, Task> handler)
     {
         var handlers = _handlers.ContainsKey(message)
                             ? _handlers[message]
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/RenderModeProvider.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/RenderModeProvider.cs
index d07cc170a1..26855bc257 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/RenderModeProvider.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Services/RenderModeProvider.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Components.Web;
+//-:cnd:noEmit
+using Microsoft.AspNetCore.Components.Web;
 
 namespace BlazorWeb.Client.Services;
 
@@ -14,5 +15,10 @@ public static class RenderModeProvider
 
     // PrerenderOnly: In order to have prerender only mode, simply remove @rendermode usages from App.razor
 
-    public static IComponentRenderMode Current => PrerenderEnabledAuto;
+    public static IComponentRenderMode Current =>
+#if DEBUG
+    BlazorServer; // Or BlazorServer, for better development experience.
+#else
+    Auto;
+#endif
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/AppComponentBase.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/AppComponentBase.cs
index eae1d0aced..dcf698515a 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/AppComponentBase.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/AppComponentBase.cs
@@ -24,12 +24,12 @@ public partial class AppComponentBase : ComponentBase
 
     [AutoInject] protected IStringLocalizer<AppStrings> Localizer = default!;
 
-    [AutoInject] protected IAuthenticationService AuthenticationService = default!;
-
-    [AutoInject] protected IExceptionHandler ExceptionHandler { get; set; } = default!;
+    [AutoInject] protected IExceptionHandler ExceptionHandler = default!;
 
     [AutoInject] protected AppAuthenticationStateProvider AuthenticationStateProvider = default!;
 
+    [CascadingParameter] public Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
     protected sealed override async Task OnInitializedAsync()
     {
         try
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/AppDataAnnotationsValidator.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/AppDataAnnotationsValidator.cs
index fde765cea4..151f6ed163 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/AppDataAnnotationsValidator.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/AppDataAnnotationsValidator.cs
@@ -21,17 +21,17 @@ public partial class AppDataAnnotationsValidator : AppComponentBase, IDisposable
     [AutoInject] private IServiceProvider _serviceProvider = default!;
     [AutoInject] private IStringLocalizerFactory _stringLocalizerFactory = default!;
 
-    [CascadingParameter] private EditContext _editContext { get; set; } = default!;
+    [CascadingParameter] public EditContext EditContext { get; set; } = default!;
 
     protected override Task OnInitAsync()
     {
-        if (_editContext is null)
+        if (EditContext is null)
             throw new InvalidOperationException("EditContext is required");
 
-        _editContext.OnFieldChanged += OnFieldChanged;
-        _editContext.OnValidationRequested += OnValidationRequested;
+        EditContext.OnFieldChanged += OnFieldChanged;
+        EditContext.OnValidationRequested += OnValidationRequested;
 
-        _validationMessageStore = new ValidationMessageStore(_editContext);
+        _validationMessageStore = new ValidationMessageStore(EditContext);
 
         return base.OnInitAsync();
     }
@@ -98,12 +98,12 @@ private void OnFieldChanged(object? sender, FieldChangedEventArgs eventArgs)
             _validationMessageStore.Add(fieldIdentifier, result.ErrorMessage!);
         }
 
-        _editContext.NotifyValidationStateChanged();
+        EditContext.NotifyValidationStateChanged();
     }
 
     private void OnValidationRequested(object? sender, ValidationRequestedEventArgs e)
     {
-        var validationContext = new ValidationContext(_editContext.Model, _serviceProvider, items: null);
+        var validationContext = new ValidationContext(EditContext.Model, _serviceProvider, items: null);
         var results = new List<ValidationResult>();
 
         var objectType = validationContext.ObjectType;
@@ -156,7 +156,7 @@ private void OnValidationRequested(object? sender, ValidationRequestedEventArgs
         }
         else
         {
-            Validator.TryValidateObject(_editContext.Model, validationContext, results, true);
+            Validator.TryValidateObject(EditContext.Model, validationContext, results, true);
         }
 
         _validationMessageStore.Clear();
@@ -168,15 +168,15 @@ private void OnValidationRequested(object? sender, ValidationRequestedEventArgs
             foreach (var memberName in validationResult.MemberNames)
             {
                 hasMemberNames = true;
-                _validationMessageStore.Add(_editContext.Field(memberName), validationResult.ErrorMessage!);
+                _validationMessageStore.Add(EditContext.Field(memberName), validationResult.ErrorMessage!);
             }
 
             if (hasMemberNames) continue;
 
-            _validationMessageStore.Add(new FieldIdentifier(_editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!);
+            _validationMessageStore.Add(new FieldIdentifier(EditContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!);
         }
 
-        _editContext.NotifyValidationStateChanged();
+        EditContext.NotifyValidationStateChanged();
     }
 
     public void Dispose()
@@ -189,10 +189,10 @@ protected virtual void Dispose(bool disposing)
     {
         if (_disposed || disposing is false) return;
 
-        if (_editContext is not null)
+        if (EditContext is not null)
         {
-            _editContext.OnFieldChanged -= OnFieldChanged;
-            _editContext.OnValidationRequested -= OnValidationRequested;
+            EditContext.OnFieldChanged -= OnFieldChanged;
+            EditContext.OnValidationRequested -= OnValidationRequested;
         }
 
         _disposed = true;
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/ChangePrerenderResponseStatusCode.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/ChangePrerenderResponseStatusCode.cs
deleted file mode 100644
index 46a7084517..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/ChangePrerenderResponseStatusCode.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Net;
-
-namespace BlazorWeb.Client.Shared;
-
-/// <summary>
-/// This component is used during prerendering to determine the value of the StatusCode parameter for the returned HTTP response.
-/// </summary>
-public partial class ChangePrerenderResponseStatusCode : AppComponentBase
-{
-    [Parameter]
-    public HttpStatusCode StatusCode { get; set; }
-
-    private static readonly Type? _httpContextAccessorType = Type.GetType("Microsoft.AspNetCore.Http.IHttpContextAccessor, Microsoft.AspNetCore.Http.Abstractions");
-
-    [AutoInject]
-    public IServiceProvider _serviceProvider = default!;
-
-    protected override Task OnInitAsync()
-    {
-        if (_httpContextAccessorType is not null)
-        {
-            var httpContextAccessor = _serviceProvider.GetService(_httpContextAccessorType);
-
-            var httpContextProperty = _httpContextAccessorType.GetProperty("HttpContext")!;
-
-            var httpContext = httpContextProperty.GetValue(httpContextAccessor)!;
-
-            var response = httpContext.GetType().GetProperty("Response")!.GetValue(httpContext)!;
-
-            response.GetType().GetProperty("StatusCode")!.SetValue(response, (int)StatusCode);
-        }
-
-        return base.OnInitAsync();
-    }
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Footer.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Footer.razor.cs
index dbfcfcc9de..7acea2d1af 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Footer.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Footer.razor.cs
@@ -3,7 +3,7 @@ namespace BlazorWeb.Client.Shared;
 
 public partial class Footer
 {
-    [AutoInject] private BitThemeManager _bitThemeManager { get; set; } = default!;
+    [AutoInject] private BitThemeManager _bitThemeManager = default!;
 
     private BitDropdownItem<string>[] _cultures = default!;
 
@@ -18,7 +18,7 @@ protected override Task OnInitAsync()
 #if MultilingualEnabled
     protected async override Task OnAfterFirstRenderAsync()
     {
-        var preferredCultureCookie = await JSRuntime.InvokeAsync<string?>("window.App.getCookie", ".AspNetCore.Culture");
+        var preferredCultureCookie = await JSRuntime.GetCookie(".AspNetCore.Culture");
 
         SelectedCulture = CultureInfoManager.GetCurrentCulture(preferredCultureCookie);
 
@@ -34,7 +34,7 @@ private async Task OnCultureChanged()
     {
         var cultureCookie = $"c={SelectedCulture}|uic={SelectedCulture}";
 
-        await JSRuntime.InvokeVoidAsync("window.App.setCookie", ".AspNetCore.Culture", cultureCookie, 30 * 24 * 3600);
+        await JSRuntime.SetCookie(".AspNetCore.Culture", cultureCookie, 30 * 24 * 3600, rememberMe: true);
 
         NavigationManager.Refresh(forceReload: true);
     }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Header.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Header.razor
index 8e3c764b0d..be41ba3eb1 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Header.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Header.razor
@@ -11,7 +11,7 @@
     <div class="header-contact">
         @if (!_isUserAuthenticated)
         {
-            <BitActionButton Class="header-item" IconName="@BitIconName.EntityExtraction" Href="/terms" Target="_self">@Localizer[nameof(AppStrings.Term)]</BitActionButton>
+            <BitActionButton Class="header-item" IconName="@BitIconName.EntityExtraction" Href="/terms" Target="_self">@Localizer[nameof(AppStrings.TermsTitle)]</BitActionButton>
             <BitActionButton Class="header-item" IconName="@BitIconName.AddFriend" Href="/sign-up" Target="_self">@Localizer[nameof(AppStrings.SignUp)]</BitActionButton>
             <BitActionButton Class="header-item" IconName="@BitIconName.Signin" Href="/sign-in" Target="_self">@Localizer[nameof(AppStrings.SignIn)]</BitActionButton>
         }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Header.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Header.razor.cs
index 7a3f55eb7f..cd2a2ebdf4 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Header.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/Header.razor.cs
@@ -11,7 +11,7 @@ protected override async Task OnInitAsync()
     {
         AuthenticationStateProvider.AuthenticationStateChanged += VerifyUserIsAuthenticatedOrNot;
 
-        _isUserAuthenticated = await PrerenderStateService.GetValue($"{nameof(Header)}-isUserAuthenticated", AuthenticationStateProvider.IsUserAuthenticatedAsync);
+        _isUserAuthenticated = await PrerenderStateService.GetValue($"{nameof(Header)}-isUserAuthenticated", async () => (await AuthenticationStateTask).User.IsAuthenticated());
 
         await base.OnInitAsync();
     }
@@ -20,7 +20,7 @@ async void VerifyUserIsAuthenticatedOrNot(Task<AuthenticationState> task)
     {
         try
         {
-            _isUserAuthenticated = await AuthenticationStateProvider.IsUserAuthenticatedAsync();
+            _isUserAuthenticated = (await task).User.IsAuthenticated();
         }
         catch (Exception ex)
         {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/MainLayout.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/MainLayout.razor.cs
index 045101222d..ded3b262fb 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/MainLayout.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/MainLayout.razor.cs
@@ -9,12 +9,14 @@ public partial class MainLayout : IDisposable
     private bool _isUserAuthenticated;
     private ErrorBoundary ErrorBoundaryRef = default!;
 
-    [AutoInject] private IPrerenderStateService _stateService = default!;
+    [AutoInject] private IPrerenderStateService _prerenderStateService = default!;
 
     [AutoInject] private IExceptionHandler _exceptionHandler = default!;
 
     [AutoInject] private AppAuthenticationStateProvider _authStateProvider = default!;
 
+    [CascadingParameter] public Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
     protected override void OnParametersSet()
     {
         // TODO: we can try to recover from exception after rendering the ErrorBoundary with this line.
@@ -30,7 +32,7 @@ protected override async Task OnInitializedAsync()
         {
             _authStateProvider.AuthenticationStateChanged += VerifyUserIsAuthenticatedOrNot;
 
-            _isUserAuthenticated = await _stateService.GetValue($"{nameof(MainLayout)}-isUserAuthenticated", _authStateProvider.IsUserAuthenticatedAsync);
+            _isUserAuthenticated = await _prerenderStateService.GetValue($"{nameof(MainLayout)}-isUserAuthenticated", async () => (await AuthenticationStateTask).User.IsAuthenticated());
 
             await base.OnInitializedAsync();
         }
@@ -44,7 +46,7 @@ async void VerifyUserIsAuthenticatedOrNot(Task<AuthenticationState> task)
     {
         try
         {
-            _isUserAuthenticated = await _authStateProvider.IsUserAuthenticatedAsync();
+            _isUserAuthenticated = (await task).User.IsAuthenticated();
         }
         catch (Exception ex)
         {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/NavMenu.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/NavMenu.razor.cs
index 78a7682672..79032dc24e 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/NavMenu.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/NavMenu.razor.cs
@@ -13,7 +13,7 @@ public partial class NavMenu : IDisposable
     private List<BitNavItem> _navItems = [];
     private Action _unsubscribe = default!;
 
-    [AutoInject] private NavigationManager _navManager { get; set; } = default!;
+    [AutoInject] private NavigationManager _navManager = default!;
 
     [Parameter] public bool IsMenuOpen { get; set; }
 
@@ -73,7 +73,7 @@ protected override async Task OnInitAsync()
             }
         ];
 
-        _unsubscribe = PubSubService.Subscribe(PubSubMessages.PROFILE_UPDATED, payload =>
+        _unsubscribe = PubSubService.Subscribe(PubSubMessages.PROFILE_UPDATED, async payload =>
         {
             if (payload is null) return;
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/PageNotFound.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/PageNotFound.razor
deleted file mode 100644
index 7fb5199185..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/PageNotFound.razor
+++ /dev/null
@@ -1,8 +0,0 @@
-@inherits AppComponentBase
-
-<ChangePrerenderResponseStatusCode StatusCode="System.Net.HttpStatusCode.NotFound" />
-
-<div class="main">
-    <h1 class="title">404</h1>
-    <div class="description">@Localizer[nameof(AppStrings.ResourceNotFoundException)]</div>
-</div>
\ No newline at end of file
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/PageNotFound.razor.scss b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/PageNotFound.razor.scss
deleted file mode 100644
index daa9f7e291..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/PageNotFound.razor.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@import '../Styles/abstracts/_functions.scss';
-@import '../Styles/abstracts/_media-queries.scss';
-
-.main {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-flow: column nowrap;
-}
-
-.title {
-    font-weight: 600;
-    font-size: rem2(120px);
-    line-height: rem2(168px);
-
-    @include lt-xl {
-        font-size: rem2(100px);
-    }
-}
-
-.description {
-    font-weight: 400;
-    font-size: rem2(18px);
-    line-height: rem2(28px);
-
-    @include lt-xl {
-        font-size: rem2(16px);
-        line-height: rem2(24px);
-    }
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/SignOutConfirmModal.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/SignOutConfirmModal.razor.cs
index 688d342662..865d284963 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/SignOutConfirmModal.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Shared/SignOutConfirmModal.razor.cs
@@ -16,7 +16,9 @@ private async Task CloseModal()
 
     private async Task SignOut()
     {
-        await AuthenticationService.SignOut();
+        await JSRuntime.RemoveAuthTokens();
+
+        await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
 
         await CloseModal();
     }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/appsettings.json b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/appsettings.json
index 423ad00545..84ec89dc0f 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/appsettings.json
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/appsettings.json
@@ -1,12 +1,3 @@
 {
-    "DetailedErrors": true,
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "AllowedHosts": "*",
     "ApiServerAddress": "api/" // You can also use absolute urls such as http://192.168.1.150:5000/api/ or https://todob.bitplatform.dev/api/
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/compilerconfig.json b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/compilerconfig.json
index 7b3e085b6d..aa39f6e475 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/compilerconfig.json
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/compilerconfig.json
@@ -1,8 +1,8 @@
 //+:cnd:noEmit
 [
     {
-        "outputFile": "Shared/MainLayout.razor.css",
-        "inputFile": "Shared/MainLayout.razor.scss",
+        "outputFile": "wwwroot/styles/app.css",
+        "inputFile": "Styles/app.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -19,8 +19,8 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/MessageBox.razor.css",
-        "inputFile": "Shared/MessageBox.razor.scss",
+        "outputFile": "Shared/Footer.razor.css",
+        "inputFile": "Shared/Footer.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -31,20 +31,20 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Footer.razor.css",
-        "inputFile": "Shared/Footer.razor.scss",
+        "outputFile": "Shared/MainLayout.razor.css",
+        "inputFile": "Shared/MainLayout.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/NavMenu.razor.css",
-        "inputFile": "Shared/NavMenu.razor.scss",
+        "outputFile": "Shared/MessageBox.razor.css",
+        "inputFile": "Shared/MessageBox.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/NotAuthorizedComponent.razor.css",
-        "inputFile": "Shared/NotAuthorizedComponent.razor.scss",
+        "outputFile": "Shared/NavMenu.razor.css",
+        "inputFile": "Shared/NavMenu.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -55,14 +55,20 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/PageNotFound.razor.css",
-        "inputFile": "Shared/PageNotFound.razor.scss",
+        "outputFile": "Pages/HomePage.razor.css",
+        "inputFile": "Pages/HomePage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/HomePage.razor.css",
-        "inputFile": "Pages/HomePage.razor.scss",
+        "outputFile": "Pages/NotAuthorizedPage.razor.css",
+        "inputFile": "Pages/NotAuthorizedPage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Pages/NotFoundPage.razor.css",
+        "inputFile": "Pages/NotFoundPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -73,14 +79,14 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/SignUpPage.razor.css",
-        "inputFile": "Pages/Identity/SignUpPage.razor.scss",
+        "outputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.css",
+        "inputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/SignInPage.razor.css",
-        "inputFile": "Pages/Identity/SignInPage.razor.scss",
+        "outputFile": "Pages/Identity/EditProfilePage.razor.css",
+        "inputFile": "Pages/Identity/EditProfilePage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -103,27 +109,21 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/EditProfilePage.razor.css",
-        "inputFile": "Pages/Identity/EditProfilePage.razor.scss",
-        "minify": { "enabled": false },
-        "options": { "sourceMap": false }
-    },
-    {
-        "outputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.css",
-        "inputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.scss",
+        "outputFile": "Pages/Identity/SignInPage.razor.css",
+        "inputFile": "Pages/Identity/SignInPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "wwwroot/styles/app.css",
-        "inputFile": "Styles/app.scss",
+        "outputFile": "Pages/Identity/SignUpPage.razor.css",
+        "inputFile": "Pages/Identity/SignUpPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     //#if (sample == "Todo")
     {
-        "outputFile": "Pages/TodoPage.razor.css",
-        "inputFile": "Pages/TodoPage.razor.scss",
+        "outputFile": "Pages/Todo/TodoPage.razor.css",
+        "inputFile": "Pages/Todo/TodoPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Infra/BlazorWeb.Iac.csproj b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Infra/BlazorWeb.Iac.csproj
index 83a8b52c30..38b88845a8 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Infra/BlazorWeb.Iac.csproj
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Infra/BlazorWeb.Iac.csproj
@@ -3,8 +3,6 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Infra/BwStack.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Infra/BwStack.cs
index 90076460bc..8ae4c2b0d4 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Infra/BwStack.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Infra/BwStack.cs
@@ -157,7 +157,7 @@ public BpStack()
                     },
                     new NameValuePairArgs
                     {
-                        Name = "AppSettings__JwtSettings__IdentityCertificatePassword",
+                        Name = "AppSettings__IdentitySettings__IdentityCertificatePassword",
                         Value = $"@Microsoft.KeyVault(VaultName={vaultName};SecretName={identityCertificatePasswordSecretName})"
                     },
                 ],
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/AppSettings.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/AppSettings.cs
index dfeb6f3331..042dfd590b 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/AppSettings.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/AppSettings.cs
@@ -4,8 +4,6 @@ public class AppSettings
 {
     public IdentitySettings IdentitySettings { get; set; } = default!;
 
-    public JwtSettings JwtSettings { get; set; } = default!;
-
     public EmailSettings EmailSettings { get; set; } = default!;
 
     public HealthCheckSettings HealthCheckSettings { get; set; } = default!;
@@ -22,6 +20,11 @@ public class HealthCheckSettings
 
 public class IdentitySettings
 {
+    public TimeSpan BearerTokenExpiration { get; set; }
+    public TimeSpan RefreshTokenExpiration { get; set; }
+    public string Issuer { get; set; } = default!;
+    public string Audience { get; set; } = default!;
+    public string IdentityCertificatePassword { get; set; } = default!;
     public bool PasswordRequireDigit { get; set; }
     public int PasswordRequiredLength { get; set; }
     public bool PasswordRequireNonAlphanumeric { get; set; }
@@ -32,15 +35,6 @@ public class IdentitySettings
     public TimeSpan ResetPasswordEmailResendDelay { get; set; }
 }
 
-public class JwtSettings
-{
-    public string IdentityCertificatePassword { get; set; } = default!;
-    public string Issuer { get; set; } = default!;
-    public string Audience { get; set; } = default!;
-    public int NotBeforeMinutes { get; set; }
-    public int ExpirationMinutes { get; set; }
-}
-
 public class EmailSettings
 {
     public string Host { get; set; } = default!;
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/BlazorWeb.Server.csproj b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/BlazorWeb.Server.csproj
index c74e744dc8..0f8aaeafe5 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/BlazorWeb.Server.csproj
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/BlazorWeb.Server.csproj
@@ -2,8 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
@@ -23,7 +21,7 @@
         <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
 
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-
+        <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.0" />
 
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.3" />
@@ -64,7 +62,6 @@
         <Using Include="BlazorWeb.Server.Data" />
         <Using Include="BlazorWeb.Server.Mappers" />
         <Using Include="BlazorWeb.Shared.Enums" />
-        <Using Include="BlazorWeb.Server.Services.Contracts" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Components/ResetPasswordTemplate.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Components/ResetPasswordTemplate.razor
index b0d68f61f4..b670be9da9 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Components/ResetPasswordTemplate.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Components/ResetPasswordTemplate.razor
@@ -11,7 +11,7 @@
     <title>@EmailLocalizer[nameof(EmailStrings.ResetPasswordEmailSubject)]</title>
 </head>
 <body style="width:100%; height:100%; margin:0; padding:0; background-color:#FCFCFC; font-family:Arial,sans-serif;">
-<main style="padding: 6% 4%;">
+    <main style="padding: 6% 4%;">
         <table class="content-table" border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
                style="border:1px solid #EDEBE9; border-radius:2px; padding:50px; text-align:center;">
             <tr>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/AppControllerBase.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/AppControllerBase.cs
index 0a45494c15..4bb23db248 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/AppControllerBase.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/AppControllerBase.cs
@@ -7,6 +7,4 @@ public partial class AppControllerBase : ControllerBase
     [AutoInject] protected AppDbContext DbContext = default!;
 
     [AutoInject] protected IStringLocalizer<AppStrings> Localizer = default!;
-
-    [AutoInject] protected IUserInformationProvider UserInformationProvider = default!;
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/AttachmentController.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/AttachmentController.cs
index 85369db819..226efc2321 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/AttachmentController.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/AttachmentController.cs
@@ -20,7 +20,7 @@ public async Task UploadProfileImage(IFormFile? file, CancellationToken cancella
         if (file is null)
             throw new BadRequestException();
 
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         var user = await _userManager.FindByIdAsync(userId.ToString());
 
@@ -74,7 +74,9 @@ public async Task UploadProfileImage(IFormFile? file, CancellationToken cancella
 
             user.ProfileImageName = destFileName;
 
-            await _userManager.UpdateAsync(user);
+            var result = await _userManager.UpdateAsync(user);
+            if (!result.Succeeded)
+                throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
         }
         catch
         {
@@ -92,7 +94,7 @@ public async Task UploadProfileImage(IFormFile? file, CancellationToken cancella
     [HttpDelete]
     public async Task RemoveProfileImage()
     {
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         var user = await _userManager.FindByIdAsync(userId.ToString());
 
@@ -108,7 +110,9 @@ public async Task RemoveProfileImage()
 
         user.ProfileImageName = null;
 
-        await _userManager.UpdateAsync(user);
+        var result = await _userManager.UpdateAsync(user);
+        if (!result.Succeeded)
+            throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
 
         SystemFile.Delete(filePath);
     }
@@ -116,7 +120,7 @@ public async Task RemoveProfileImage()
     [HttpGet]
     public async Task<IActionResult> GetProfileImage()
     {
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         var user = await _userManager.FindByIdAsync(userId.ToString());
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Categories/CategoryController.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Categories/CategoryController.cs
index d2b790ccf4..f99e7da781 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Categories/CategoryController.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Categories/CategoryController.cs
@@ -38,7 +38,7 @@ public async Task<PagedResult<CategoryDto>> GetCategories(ODataQueryOptions<Cate
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<CategoryDto>(await query.ToListAsync(cancellationToken), totalCount);
+        return new PagedResult<CategoryDto>(query.AsAsyncEnumerable(), totalCount);
     }
 
     [HttpPost]
@@ -65,15 +65,13 @@ public async Task<CategoryDto> Update(CategoryDto dto, CancellationToken cancell
 
         await DbContext.SaveChangesAsync(cancellationToken);
 
-        categoryToUpdate.Patch(dto);
-
-        return dto;
+        return categoryToUpdate.Map();
     }
 
     [HttpDelete("{id:int}")]
     public async Task Delete(int id, CancellationToken cancellationToken)
     {
-        if (await DbContext.Products.AnyAsync(p => p.CategoryId == id))
+        if (await DbContext.Products.AnyAsync(p => p.CategoryId == id, cancellationToken))
         {
             throw new BadRequestException(Localizer[nameof(AppStrings.CategoryNotEmpty)]);
         }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/AuthController.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/IdentityController.cs
similarity index 71%
rename from src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/AuthController.cs
rename to src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/IdentityController.cs
index 82de248457..310022f672 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/AuthController.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/IdentityController.cs
@@ -6,6 +6,7 @@
 using BlazorWeb.Server.Resources;
 using BlazorWeb.Shared.Dtos.Identity;
 using FluentEmail.Core;
+using Microsoft.AspNetCore.Authentication.BearerToken;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
@@ -13,12 +14,10 @@ namespace BlazorWeb.Server.Controllers.Identity;
 
 [Microsoft.AspNetCore.Mvc.Route("api/[controller]/[action]")]
 [ApiController, AllowAnonymous]
-public partial class AuthController : AppControllerBase
+public partial class IdentityController : AppControllerBase
 {
     [AutoInject] private UserManager<User> _userManager = default!;
 
-    [AutoInject] private IJwtService _jwtService = default!;
-
     [AutoInject] private SignInManager<User> _signInManager = default!;
 
     [AutoInject] private IFluentEmail _fluentEmail = default!;
@@ -27,7 +26,9 @@ public partial class AuthController : AppControllerBase
 
     [AutoInject] private HtmlRenderer _htmlRenderer = default!;
 
-    [AutoInject] protected IStringLocalizer<IdentityStrings> IdentityLocalizer = default!;
+    [AutoInject] private IStringLocalizer<IdentityStrings> _identityLocalizer = default!;
+
+    [AutoInject] private IOptionsMonitor<BearerTokenOptions> _bearerTokenOptions = default!;
 
     /// <summary>
     /// By leveraging summary tags in your controller's actions and DTO properties you can make your codes much easier to maintain.
@@ -48,16 +49,20 @@ public async Task SignUp(SignUpRequestDto signUpRequest, CancellationToken cance
             }
             else
             {
-                await _userManager.DeleteAsync(existingUser);
+                var deleteResult = await _userManager.DeleteAsync(existingUser);
+                if (!deleteResult.Succeeded)
+                    throw new ResourceValidationException(deleteResult.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
                 userToAdd.ConfirmationEmailRequestedOn = existingUser.ConfirmationEmailRequestedOn;
             }
         }
 
+        userToAdd.LockoutEnabled = true;
+
         var result = await _userManager.CreateAsync(userToAdd, signUpRequest.Password!);
 
         if (result.Succeeded is false)
         {
-            throw new ResourceValidationException(result.Errors.Select(e => IdentityLocalizer.GetString(e.Code, signUpRequest.Email!)).ToArray());
+            throw new ResourceValidationException(result.Errors.Select(e => new LocalizedString(e.Code, e.Description)).ToArray());
         }
 
         await SendConfirmationEmail(new() { Email = userToAdd.Email }, userToAdd, cancellationToken);
@@ -122,6 +127,76 @@ private async Task SendConfirmationEmail(SendConfirmationEmailRequestDto sendCon
             throw new ResourceValidationException(result.ErrorMessages.Select(err => Localizer[err]).ToArray());
     }
 
+    [HttpGet]
+    public async Task<ActionResult> ConfirmEmail(string email, string token)
+    {
+        var user = await _userManager.FindByEmailAsync(email);
+
+        if (user is null)
+            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserNameNotFound), email));
+
+        var emailConfirmed = user.EmailConfirmed;
+        var errors = string.Empty;
+
+        if (emailConfirmed is false)
+        {
+            var result = await _userManager.ConfirmEmailAsync(user, token);
+            if (!result.Succeeded)
+                errors = string.Join(", ", result.Errors.Select(e => $"{e.Code}: {e.Description}"));
+            emailConfirmed = result.Succeeded;
+        }
+
+        string url = $"/email-confirmation?email={email}&email-confirmed={emailConfirmed}{(string.IsNullOrEmpty(errors) ? "" : ($"&error={errors}"))}";
+
+        return Redirect(url);
+    }
+
+    [HttpPost]
+    public async Task SignIn(SignInRequestDto signInRequest)
+    {
+        _signInManager.AuthenticationScheme = IdentityConstants.BearerScheme;
+
+        var result = await _signInManager.PasswordSignInAsync(signInRequest.UserName!, signInRequest.Password!, isPersistent: false, lockoutOnFailure: true);
+
+        if (result.IsLockedOut)
+        {
+            var user = await _userManager.FindByNameAsync(signInRequest.UserName!);
+            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserLockedOut), (DateTimeOffset.UtcNow - user!.LockoutEnd!).Value.ToString("mm\\:ss")));
+        }
+
+        /* if (result.RequiresTwoFactor)
+        {
+            if (!string.IsNullOrEmpty(signInRequest.TwoFactorCode))
+            {
+                result = await _signInManager.TwoFactorAuthenticatorSignInAsync(signInRequest.TwoFactorCode, rememberClient: true);
+            }
+            else if (!string.IsNullOrEmpty(signInRequest.TwoFactorRecoveryCode))
+            {
+                result = await _signInManager.TwoFactorRecoveryCodeSignInAsync(signInRequest.TwoFactorRecoveryCode);
+            }
+        } */
+
+        if (result.Succeeded is false)
+            throw new UnauthorizedException(Localizer.GetString(nameof(AppStrings.InvalidUsernameOrPassword)));
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<TokenResponseDto>> Refresh(RefreshRequestDto refreshRequest)
+    {
+        var refreshTokenProtector = _bearerTokenOptions.Get(IdentityConstants.BearerScheme).RefreshTokenProtector;
+        var refreshTicket = refreshTokenProtector.Unprotect(refreshRequest.RefreshToken);
+
+        if (refreshTicket?.Properties?.ExpiresUtc is not { } expiresUtc || DateTimeOffset.UtcNow >= expiresUtc ||
+                await _signInManager.ValidateSecurityStampAsync(refreshTicket.Principal) is not User user)
+        {
+            return Challenge();
+        }
+
+        var newPrincipal = await _signInManager.CreateUserPrincipalAsync(user);
+
+        return SignIn(newPrincipal, authenticationScheme: IdentityConstants.BearerScheme);
+    }
+
     [HttpPost]
     public async Task SendResetPasswordEmail(SendResetPasswordEmailRequestDto sendResetPasswordEmailRequest
           , CancellationToken cancellationToken)
@@ -173,21 +248,6 @@ public async Task SendResetPasswordEmail(SendResetPasswordEmailRequestDto sendRe
             throw new ResourceValidationException(result.ErrorMessages.Select(err => Localizer[err]).ToArray());
     }
 
-    [HttpGet]
-    public async Task<ActionResult> ConfirmEmail(string email, string token)
-    {
-        var user = await _userManager.FindByEmailAsync(email);
-
-        if (user is null)
-            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserNameNotFound), email));
-
-        var emailConfirmed = user.EmailConfirmed || (await _userManager.ConfirmEmailAsync(user, token)).Succeeded;
-
-        string url = $"/email-confirmation?email={email}&email-confirmed={emailConfirmed}";
-
-        return Redirect(url);
-    }
-
     [HttpPost]
     public async Task ResetPassword(ResetPasswordRequestDto resetPasswordRequest)
     {
@@ -199,25 +259,6 @@ public async Task ResetPassword(ResetPasswordRequestDto resetPasswordRequest)
         var result = await _userManager.ResetPasswordAsync(user, resetPasswordRequest.Token!, resetPasswordRequest.Password!);
 
         if (!result.Succeeded)
-            throw new ResourceValidationException(result.Errors.Select(e => IdentityLocalizer.GetString(e.Code, resetPasswordRequest.Email!)).ToArray());
-    }
-
-    [HttpPost]
-    public async Task<SignInResponseDto> SignIn(SignInRequestDto signInRequest)
-    {
-        var user = await _userManager.FindByNameAsync(signInRequest.UserName!);
-
-        if (user is null)
-            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserNameNotFound), signInRequest.UserName!));
-
-        var checkPasswordResult = await _signInManager.CheckPasswordSignInAsync(user, signInRequest.Password!, lockoutOnFailure: true);
-
-        if (checkPasswordResult.IsLockedOut)
-            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserLockedOut), (DateTimeOffset.UtcNow - user.LockoutEnd!).Value.ToString("mm\\:ss")));
-
-        if (!checkPasswordResult.Succeeded)
-            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.InvalidUsernameOrPassword), signInRequest.UserName!));
-
-        return await _jwtService.GenerateToken(user);
+            throw new ResourceValidationException(result.Errors.Select(e => new LocalizedString(e.Code, e.Description)).ToArray());
     }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/UserController.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/UserController.cs
index a5598e960f..583826b55e 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/UserController.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Identity/UserController.cs
@@ -34,7 +34,9 @@ public async Task<UserDto> Update(EditUserDto userDto, CancellationToken cancell
 
         userDto.Patch(user);
 
-        await _userManager.UpdateAsync(user);
+        var result = await _userManager.UpdateAsync(user);
+        if (!result.Succeeded)
+            throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
 
         return await GetCurrentUser(cancellationToken);
     }
@@ -42,11 +44,13 @@ public async Task<UserDto> Update(EditUserDto userDto, CancellationToken cancell
     [HttpDelete]
     public async Task Delete(CancellationToken cancellationToken)
     {
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         var user = await _userManager.Users.FirstOrDefaultAsync(user => user.Id == userId, cancellationToken)
                     ?? throw new ResourceNotFoundException();
 
-        await _userManager.DeleteAsync(user);
+        var result = await _userManager.DeleteAsync(user);
+        if (!result.Succeeded)
+            throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
     }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Products/ProductController.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Products/ProductController.cs
index 419c458dd3..f274f9770f 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Products/ProductController.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Products/ProductController.cs
@@ -38,7 +38,7 @@ public async Task<PagedResult<ProductDto>> GetProducts(ODataQueryOptions<Product
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<ProductDto>(await query.ToListAsync(cancellationToken), totalCount);
+        return new PagedResult<ProductDto>(query.AsAsyncEnumerable(), totalCount);
     }
 
     [HttpPost]
@@ -65,9 +65,7 @@ public async Task<ProductDto> Update(ProductDto dto, CancellationToken cancellat
 
         await DbContext.SaveChangesAsync(cancellationToken);
 
-        productToUpdate.Patch(dto);
-
-        return dto;
+        return productToUpdate.Map();
     }
 
     [HttpDelete("{id:int}")]
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Todo/TodoItemController.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Todo/TodoItemController.cs
index fee625fb5e..f3e1f49b50 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Todo/TodoItemController.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Controllers/Todo/TodoItemController.cs
@@ -10,7 +10,7 @@ public partial class TodoItemController : AppControllerBase
     [HttpGet, EnableQuery]
     public IQueryable<TodoItemDto> Get()
     {
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         return DbContext.TodoItems
             .Where(t => t.UserId == userId)
@@ -41,7 +41,7 @@ public async Task<PagedResult<TodoItemDto>> GetTodoItems(ODataQueryOptions<TodoI
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<TodoItemDto>(await query.ToListAsync(cancellationToken), totalCount);
+        return new PagedResult<TodoItemDto>(query.AsAsyncEnumerable(), totalCount);
     }
 
     [HttpPost]
@@ -49,7 +49,7 @@ public async Task<TodoItemDto> Create(TodoItemDto dto, CancellationToken cancell
     {
         var todoItemToAdd = dto.Map();
 
-        todoItemToAdd.UserId = UserInformationProvider.GetUserId();
+        todoItemToAdd.UserId = User.GetUserId();
 
         todoItemToAdd.Date = DateTimeOffset.UtcNow;
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/AppDbContext.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/AppDbContext.cs
index 4d02ae60de..28aa5de902 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/AppDbContext.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/AppDbContext.cs
@@ -1,18 +1,20 @@
 //+:cnd:noEmit
-using BlazorWeb.Server.Models.Identity;
-//#if (sample == "Todo")
-using BlazorWeb.Server.Models.Todo;
 //#elif (sample == "AdminPanel")
 using BlazorWeb.Server.Models.Categories;
+using BlazorWeb.Server.Models.Identity;
 using BlazorWeb.Server.Models.Products;
+//#if (sample == "Todo")
+using BlazorWeb.Server.Models.Todo;
 //#endif
+using Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace BlazorWeb.Server.Data;
 
-public class AppDbContext(DbContextOptions<AppDbContext> options) 
-    : IdentityDbContext<User, Role, int>(options)
+public class AppDbContext(DbContextOptions<AppDbContext> options)
+    : IdentityDbContext<User, Role, int>(options), IDataProtectionKeyContext
 {
+    public DbSet<DataProtectionKey> DataProtectionKeys { get; set; }
 
     //#if (sample == "Todo")
     public DbSet<TodoItem> TodoItems { get; set; }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Configurations/Identity/UserConfiguration.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Configurations/Identity/UserConfiguration.cs
index a559c755b8..2f2d793f8e 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Configurations/Identity/UserConfiguration.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Configurations/Identity/UserConfiguration.cs
@@ -12,6 +12,7 @@ public void Configure(EntityTypeBuilder<User> builder)
         {
             Id = 1,
             EmailConfirmed = true,
+            LockoutEnabled = true,
             Gender = Gender.Other,
             BirthDate = new DateTime(2023, 1, 1),
             FullName = "BlazorWeb test account",
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231114012959_InitialMigration.Designer.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231118003945_InitialMigration.Designer.cs
similarity index 96%
rename from src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231114012959_InitialMigration.Designer.cs
rename to src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231118003945_InitialMigration.Designer.cs
index 95c7a0b3c6..acb2a34f66 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231114012959_InitialMigration.Designer.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231118003945_InitialMigration.Designer.cs
@@ -12,7 +12,7 @@
 namespace BlazorWeb.Server.Data.Migrations
 {
     [DbContext(typeof(AppDbContext))]
-    [Migration("20231114012959_InitialMigration")]
+    [Migration("20231118003945_InitialMigration")]
     partial class InitialMigration
     {
         /// <inheritdoc />
@@ -199,17 +199,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             Id = 1,
                             AccessFailedCount = 0,
                             BirthDate = new DateTimeOffset(new DateTime(2023, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 1, 0, 0, 0)),
-                            ConcurrencyStamp = "a93803e4-4826-4f8f-a3c0-9b3915222944",
+                            ConcurrencyStamp = "3e496120-43ec-4f42-b607-7cdf2a3cd843",
                             Email = "test@bitplatform.dev",
                             EmailConfirmed = true,
                             FullName = "BlazorWeb test account",
                             Gender = 2,
-                            LockoutEnabled = false,
+                            LockoutEnabled = true,
                             NormalizedEmail = "TEST@BITPLATFORM.DEV",
                             NormalizedUserName = "TEST@BITPLATFORM.DEV",
-                            PasswordHash = "AQAAAAIAAYagAAAAEHkXKL/4p8zGmGPVrQLM4FFbgg0ZDGlCtICfXdEArQg/Ih7Kkn9LfNCZME2+wd0APw==",
+                            PasswordHash = "AQAAAAIAAYagAAAAEBv9z0VdfunYh4mV9x8IJiLvR1WefLnibCf5ugcGZH5E9FstjLa9oQiDMGXDJguDiw==",
                             PhoneNumberConfirmed = false,
-                            SecurityStamp = "e8fe621c-97fd-41ec-9d33-29c931496432",
+                            SecurityStamp = "e8c42956-0730-46cb-8e7b-fdcd7acbd4bf",
                             TwoFactorEnabled = false,
                             UserName = "test@bitplatform.dev"
                         });
@@ -484,6 +484,25 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("TodoItems");
                 });
 
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys");
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
                 {
                     b.Property<int>("Id")
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231114012959_InitialMigration.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231118003945_InitialMigration.cs
similarity index 94%
rename from src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231114012959_InitialMigration.cs
rename to src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231118003945_InitialMigration.cs
index b36d14b499..cf99e74b97 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231114012959_InitialMigration.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/20231118003945_InitialMigration.cs
@@ -1,7 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
+#nullable disable
 
 #pragma warning disable DateTimeOffsetInsteadOfDateTimeAnalyzer
 
@@ -27,6 +24,20 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_Categories", x => x.Id);
             });
 
+        migrationBuilder.CreateTable(
+            name: "DataProtectionKeys",
+            columns: table => new
+            {
+                Id = table.Column<int>(type: "int", nullable: false)
+                    .Annotation("SqlServer:Identity", "1, 1"),
+                FriendlyName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                Xml = table.Column<string>(type: "nvarchar(max)", nullable: true)
+            },
+            constraints: table =>
+            {
+                table.PrimaryKey("PK_DataProtectionKeys", x => x.Id);
+            });
+
         migrationBuilder.CreateTable(
             name: "Roles",
             columns: table => new
@@ -240,7 +251,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
         migrationBuilder.InsertData(
             table: "Users",
             columns: new[] { "Id", "AccessFailedCount", "BirthDate", "ConcurrencyStamp", "ConfirmationEmailRequestedOn", "Email", "EmailConfirmed", "FullName", "Gender", "LockoutEnabled", "LockoutEnd", "NormalizedEmail", "NormalizedUserName", "PasswordHash", "PhoneNumber", "PhoneNumberConfirmed", "ProfileImageName", "ResetPasswordEmailRequestedOn", "SecurityStamp", "TwoFactorEnabled", "UserName" },
-            values: new object[] { 1, 0, new DateTimeOffset(new DateTime(2023, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 1, 0, 0, 0)), "a93803e4-4826-4f8f-a3c0-9b3915222944", null, "test@bitplatform.dev", true, "BlazorWeb test account", 2, false, null, "TEST@BITPLATFORM.DEV", "TEST@BITPLATFORM.DEV", "AQAAAAIAAYagAAAAEHkXKL/4p8zGmGPVrQLM4FFbgg0ZDGlCtICfXdEArQg/Ih7Kkn9LfNCZME2+wd0APw==", null, false, null, null, "e8fe621c-97fd-41ec-9d33-29c931496432", false, "test@bitplatform.dev" });
+            values: new object[] { 1, 0, new DateTimeOffset(new DateTime(2023, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 1, 0, 0, 0)), "3e496120-43ec-4f42-b607-7cdf2a3cd843", null, "test@bitplatform.dev", true, "BlazorWeb test account", 2, true, null, "TEST@BITPLATFORM.DEV", "TEST@BITPLATFORM.DEV", "AQAAAAIAAYagAAAAEBv9z0VdfunYh4mV9x8IJiLvR1WefLnibCf5ugcGZH5E9FstjLa9oQiDMGXDJguDiw==", null, false, null, null, "e8c42956-0730-46cb-8e7b-fdcd7acbd4bf", false, "test@bitplatform.dev" });
 
         migrationBuilder.InsertData(
             table: "Products",
@@ -325,6 +336,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
     /// <inheritdoc />
     protected override void Down(MigrationBuilder migrationBuilder)
     {
+        migrationBuilder.DropTable(
+            name: "DataProtectionKeys");
+
         migrationBuilder.DropTable(
             name: "Products");
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/AppDbContextModelSnapshot.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/AppDbContextModelSnapshot.cs
index a1261830f4..310c0c6b1c 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Data/Migrations/AppDbContextModelSnapshot.cs
@@ -196,17 +196,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             Id = 1,
                             AccessFailedCount = 0,
                             BirthDate = new DateTimeOffset(new DateTime(2023, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 1, 0, 0, 0)),
-                            ConcurrencyStamp = "a93803e4-4826-4f8f-a3c0-9b3915222944",
+                            ConcurrencyStamp = "3e496120-43ec-4f42-b607-7cdf2a3cd843",
                             Email = "test@bitplatform.dev",
                             EmailConfirmed = true,
                             FullName = "BlazorWeb test account",
                             Gender = 2,
-                            LockoutEnabled = false,
+                            LockoutEnabled = true,
                             NormalizedEmail = "TEST@BITPLATFORM.DEV",
                             NormalizedUserName = "TEST@BITPLATFORM.DEV",
-                            PasswordHash = "AQAAAAIAAYagAAAAEHkXKL/4p8zGmGPVrQLM4FFbgg0ZDGlCtICfXdEArQg/Ih7Kkn9LfNCZME2+wd0APw==",
+                            PasswordHash = "AQAAAAIAAYagAAAAEBv9z0VdfunYh4mV9x8IJiLvR1WefLnibCf5ugcGZH5E9FstjLa9oQiDMGXDJguDiw==",
                             PhoneNumberConfirmed = false,
-                            SecurityStamp = "e8fe621c-97fd-41ec-9d33-29c931496432",
+                            SecurityStamp = "e8c42956-0730-46cb-8e7b-fdcd7acbd4bf",
                             TwoFactorEnabled = false,
                             UserName = "test@bitplatform.dev"
                         });
@@ -481,6 +481,25 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("TodoItems");
                 });
 
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys");
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
                 {
                     b.Property<int>("Id")
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Extensions/IServiceCollectionExtensions.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Extensions/IServiceCollectionExtensions.cs
index 2162a7b429..111ca3c250 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Extensions/IServiceCollectionExtensions.cs
@@ -1,17 +1,14 @@
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Components.WebAssembly.Services;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
+using BlazorWeb.Client.Services;
+using BlazorWeb.Client.Services.HttpMessageHandlers;
 using BlazorWeb.Server;
 using BlazorWeb.Server.Models.Identity;
 using BlazorWeb.Server.Services;
-using BlazorWeb.Client.Services;
-using Microsoft.JSInterop;
-using BlazorWeb.Client.Services.HttpMessageHandlers;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.IdentityModel.Tokens;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -19,36 +16,22 @@ public static class IServiceCollectionExtensions
 {
     public static void AddBlazor(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddScoped<IAuthTokenProvider, ServerSideAuthTokenProvider>();
+        services.AddTransient<IAuthTokenProvider, ServerSideAuthTokenProvider>();
 
-        services.AddScoped(sp =>
+        services.AddTransient(sp =>
         {
-            IHttpClientFactory httpClientFactory = sp.GetRequiredService<IHttpClientFactory>();
-            return httpClientFactory.CreateClient("BlazorHttpClient");
-            // This registers HttpClient for pre rendering & blazor server only, so to use http client to call 3rd party apis and other use cases,
-            // either use services.AddHttpClient("NamedHttpClient") or services.AddHttpClient<TypedHttpClient>();
-        });
+            Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
 
-        // In the Pre-Rendering mode, the configured HttpClient will use the access_token provided by the cookie in the request, so the pre-rendered content would be fitting for the current user.
-        services.AddHttpClient("BlazorHttpClient")
-            .AddHttpMessageHandler(sp => new LocalizationDelegatingHandler())
-            .AddHttpMessageHandler(sp => new AuthDelegatingHandler(sp.GetRequiredService<IAuthTokenProvider>(), sp.GetRequiredService<IJSRuntime>()))
-            .AddHttpMessageHandler(sp => new RetryDelegatingHandler())
-            .AddHttpMessageHandler(sp => new ExceptionDelegatingHandler())
-            .ConfigurePrimaryHttpMessageHandler<HttpClientHandler>()
-            .ConfigureHttpClient((sp, httpClient) =>
+            if (apiServerAddress!.IsAbsoluteUri is false)
             {
-                Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
-
-                if (apiServerAddress!.IsAbsoluteUri is false)
-                {
-                    apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
-                }
-
-                httpClient.BaseAddress = apiServerAddress;
-            });
+                apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
+            }
 
-        services.AddScoped<LazyAssemblyLoader>();
+            return new HttpClient(sp.GetRequiredService<RequestHeadersDelegationHandler>())
+            {
+                BaseAddress = apiServerAddress
+            };
+        });
 
         services.AddRazorComponents()
             .AddInteractiveServerComponents()
@@ -60,6 +43,12 @@ public static void AddIdentity(this IServiceCollection services, IConfiguration
         var appSettings = configuration.GetSection(nameof(AppSettings)).Get<AppSettings>()!;
         var settings = appSettings.IdentitySettings;
 
+        var certificatePath = Path.Combine(Directory.GetCurrentDirectory(), "IdentityCertificate.pfx");
+
+        services.AddDataProtection()
+            .PersistKeysToDbContext<AppDbContext>()
+            .ProtectKeysWithCertificate(new X509Certificate2(certificatePath, appSettings.IdentitySettings.IdentityCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet));
+
         services.AddIdentity<User, Role>(options =>
         {
             options.User.RequireUniqueEmail = settings.RequireUniqueEmail;
@@ -69,31 +58,26 @@ public static void AddIdentity(this IServiceCollection services, IConfiguration
             options.Password.RequireUppercase = settings.PasswordRequireUppercase;
             options.Password.RequireNonAlphanumeric = settings.PasswordRequireNonAlphanumeric;
             options.Password.RequiredLength = settings.PasswordRequiredLength;
-        }).AddEntityFrameworkStores<AppDbContext>().AddDefaultTokenProviders();
-    }
-
-    public static void AddJwt(this IServiceCollection services, IConfiguration configuration)
-    {
-        // https://github.com/dotnet/aspnetcore/issues/4660
-        JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
-        JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
-        JwtSecurityTokenHandler.DefaultOutboundClaimTypeMap.Clear();
-
-        var appSettings = configuration.GetSection(nameof(AppSettings)).Get<AppSettings>()!;
-        var settings = appSettings.JwtSettings;
-
-        services.AddScoped<IJwtService, JwtService>();
+        })
+            .AddEntityFrameworkStores<AppDbContext>()
+            .AddDefaultTokenProviders()
+            .AddErrorDescriber<AppIdentityErrorDescriber>()
+            .AddApiEndpoints();
 
         services.AddAuthentication(options =>
         {
-            options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-            options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-            options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
-        }).AddJwtBearer(options =>
+            options.DefaultAuthenticateScheme = IdentityConstants.BearerScheme;
+            options.DefaultChallengeScheme = IdentityConstants.BearerScheme;
+            options.DefaultScheme = IdentityConstants.BearerScheme;
+        })
+        .AddBearerToken(IdentityConstants.BearerScheme, options =>
         {
+            options.BearerTokenExpiration = settings.BearerTokenExpiration;
+            options.RefreshTokenExpiration = settings.RefreshTokenExpiration;
+
             var certificatePath = Path.Combine(Directory.GetCurrentDirectory(), "IdentityCertificate.pfx");
             RSA? rsaPrivateKey;
-            using (X509Certificate2 signingCert = new X509Certificate2(certificatePath, appSettings.JwtSettings.IdentityCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet))
+            using (X509Certificate2 signingCert = new X509Certificate2(certificatePath, appSettings.IdentitySettings.IdentityCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet))
             {
                 rsaPrivateKey = signingCert.GetRSAPrivateKey();
             }
@@ -114,27 +98,20 @@ public static void AddJwt(this IServiceCollection services, IConfiguration confi
 
                 ValidateIssuer = true,
                 ValidIssuer = settings.Issuer,
+
+                AuthenticationType = IdentityConstants.BearerScheme
             };
 
-            options.Events = new JwtBearerEvents
+            options.BearerTokenProtector = new AppSecureJwtDataFormat(appSettings, validationParameters);
+
+            options.Events = new()
             {
                 OnMessageReceived = async context =>
                 {
                     // The server accepts the access_token from either the authorization header, the cookie, or the request URL query string
-
-                    var access_token = context.Request.Cookies["access_token"];
-
-                    if (string.IsNullOrEmpty(access_token))
-                    {
-                        access_token = context.Request.Query["access_token"];
-                    }
-
-                    context.Token = access_token;
+                    context.Token ??= context.Request.Cookies["access_token"] ?? context.Request.Query["access_token"];
                 }
             };
-
-            options.SaveToken = true;
-            options.TokenValidationParameters = validationParameters;
         });
 
         services.AddAuthorization();
@@ -149,28 +126,29 @@ public static void AddSwaggerGen(this IServiceCollection services)
 
             options.OperationFilter<ODataOperationFilter>();
 
-            options.AddSecurityDefinition("bearerAuth", new OpenApiSecurityScheme
+            options.AddSecurityDefinition("bearerAuth", new()
             {
                 Name = "Authorization",
-                Type = SecuritySchemeType.Http,
-                Scheme = "bearer",
-                BearerFormat = "JWT",
+                Description = "Enter the Bearer Authorization string as following: `Bearer Generated-Bearer-Token`",
                 In = ParameterLocation.Header,
-                Description = "JWT Authorization header using the Bearer scheme."
+                Type = SecuritySchemeType.ApiKey,
+                Scheme = "Bearer"
             });
 
-            options.AddSecurityRequirement(new OpenApiSecurityRequirement
+            options.AddSecurityRequirement(new()
             {
                 {
-                    new OpenApiSecurityScheme
+                    new()
                     {
+                        Name = "Bearer",
+                        In = ParameterLocation.Header,
                         Reference = new OpenApiReference
                         {
-                            Type = ReferenceType.SecurityScheme,
-                            Id = "bearerAuth"
+                            Id = "Bearer",
+                            Type = ReferenceType.SecurityScheme
                         }
                     },
-                    Array.Empty<string>()
+                    []
                 }
             });
         });
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Extensions/ODataOperationFilter.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Extensions/ODataOperationFilter.cs
index bc15442072..d13ddd59eb 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Extensions/ODataOperationFilter.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Extensions/ODataOperationFilter.cs
@@ -12,7 +12,10 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
     {
         if (operation.Parameters == null) operation.Parameters = new List<OpenApiParameter>();
 
-        var descriptor = (ControllerActionDescriptor)context.ApiDescription.ActionDescriptor;
+        var descriptor = context.ApiDescription.ActionDescriptor as ControllerActionDescriptor;
+
+        if (descriptor is null)
+            return;
 
         var odataQueryOptionsParameter = descriptor!.Parameters.SingleOrDefault(p => typeof(ODataQueryOptions).IsAssignableFrom(p.ParameterType));
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Mappers/TodoMapper.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Mappers/TodoMapper.cs
index 056f1c0e05..8ca62cf295 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Mappers/TodoMapper.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Mappers/TodoMapper.cs
@@ -1,6 +1,6 @@
-using Riok.Mapperly.Abstractions;
-using BlazorWeb.Server.Models.Todo;
+using BlazorWeb.Server.Models.Todo;
 using BlazorWeb.Shared.Dtos.Todo;
+using Riok.Mapperly.Abstractions;
 
 namespace BlazorWeb.Server.Mappers;
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/ApiExceptionHandler.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/ApiExceptionHandler.cs
index ab3edf629b..dd706605fb 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/ApiExceptionHandler.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/ApiExceptionHandler.cs
@@ -7,6 +7,7 @@ namespace BlazorWeb.Server.Services;
 public partial class ApiExceptionHandler : IExceptionHandler
 {
     [AutoInject] private IWebHostEnvironment _webHostEnvironment = default!;
+    [AutoInject] private IStringLocalizer<AppStrings> _localizer = default!;
 
     public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e, CancellationToken cancellationToken)
     {
@@ -14,18 +15,17 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
         httpContext.Response.Headers.Append("Request-ID", httpContext.TraceIdentifier);
 
         var exception = UnWrapException(e);
-        var localizer = httpContext.RequestServices.GetRequiredService<IStringLocalizer<AppStrings>>();
         var knownException = exception as KnownException;
 
         // The details of all of the exceptions are returned only in dev mode. in any other modes like production, only the details of the known exceptions are returned.
         var key = knownException?.Key ?? nameof(UnknownException);
-        var message = knownException?.Message ?? (_webHostEnvironment.IsDevelopment() ? exception.Message : localizer[nameof(UnknownException)]);
+        var message = knownException?.Message ?? (_webHostEnvironment.IsDevelopment() ? exception.Message : _localizer[nameof(UnknownException)]);
 
         var statusCode = (int)(exception is RestException restExp ? restExp.StatusCode : HttpStatusCode.InternalServerError);
 
         if (exception is KnownException && message == key)
         {
-            message = localizer[message];
+            message = _localizer[message];
         }
 
         var restExceptionPayload = new RestErrorInfo
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/AppIdentityErrorDescriber.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/AppIdentityErrorDescriber.cs
new file mode 100644
index 0000000000..17ef338e5a
--- /dev/null
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/AppIdentityErrorDescriber.cs
@@ -0,0 +1,61 @@
+using System.Data;
+
+namespace BlazorWeb.Client.Services;
+
+public partial class AppIdentityErrorDescriber : IdentityErrorDescriber
+{
+    [AutoInject] IStringLocalizer<IdentityStrings> _localizer = default!;
+
+    IdentityError CreateIdentityError(string code, params object[] args)
+    {
+        return new()
+        {
+            Code = code,
+            Description = _localizer.GetString(code, args)
+        };
+    }
+
+    public override IdentityError ConcurrencyFailure() => CreateIdentityError(nameof(IdentityStrings.ConcurrencyFailure));
+
+    public override IdentityError DuplicateEmail(string email) => CreateIdentityError(nameof(IdentityStrings.DuplicateEmail), email);
+
+    public override IdentityError DuplicateRoleName(string role) => CreateIdentityError(nameof(IdentityStrings.DuplicateRoleName), role);
+
+    public override IdentityError DuplicateUserName(string userName) => CreateIdentityError(nameof(IdentityStrings.DuplicateUserName), userName);
+
+    public override IdentityError InvalidEmail(string? email) => CreateIdentityError(nameof(IdentityStrings.InvalidEmail), email ?? string.Empty);
+
+    public override IdentityError InvalidRoleName(string? role) => CreateIdentityError(nameof(IdentityStrings.InvalidRoleName), role ?? string.Empty);
+
+    public override IdentityError InvalidToken() => CreateIdentityError(nameof(IdentityStrings.InvalidToken));
+
+    public override IdentityError InvalidUserName(string? userName) => CreateIdentityError(nameof(IdentityStrings.InvalidUserName), userName ?? string.Empty);
+
+    public override IdentityError LoginAlreadyAssociated() => CreateIdentityError(nameof(IdentityStrings.LoginAlreadyAssociated));
+
+    public override IdentityError PasswordMismatch() => CreateIdentityError(nameof(IdentityStrings.PasswordMismatch));
+
+    public override IdentityError PasswordRequiresDigit() => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresDigit));
+
+    public override IdentityError PasswordRequiresLower() => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresLower));
+
+    public override IdentityError PasswordRequiresNonAlphanumeric() => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresNonAlphanumeric));
+
+    public override IdentityError PasswordRequiresUniqueChars(int uniqueChars) => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresUniqueChars), uniqueChars);
+
+    public override IdentityError PasswordRequiresUpper() => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresUpper));
+
+    public override IdentityError PasswordTooShort(int length) => CreateIdentityError(nameof(IdentityStrings.PasswordTooShort));
+
+    public override IdentityError RecoveryCodeRedemptionFailed() => CreateIdentityError(nameof(IdentityStrings.RecoveryCodeRedemptionFailed));
+
+    public override IdentityError UserAlreadyHasPassword() => CreateIdentityError(nameof(IdentityStrings.UserAlreadyHasPassword));
+
+    public override IdentityError UserAlreadyInRole(string role) => CreateIdentityError(nameof(IdentityStrings.UserAlreadyInRole), role);
+
+    public override IdentityError UserLockoutNotEnabled() => CreateIdentityError(nameof(IdentityStrings.UserLockoutNotEnabled));
+
+    public override IdentityError UserNotInRole(string role) => CreateIdentityError(nameof(IdentityStrings.UserNotInRole), role);
+
+    public override IdentityError DefaultError() => CreateIdentityError(nameof(IdentityStrings.DefaultError));
+}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/AppSecureJwtDataFormat.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/AppSecureJwtDataFormat.cs
new file mode 100644
index 0000000000..38330b1199
--- /dev/null
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/AppSecureJwtDataFormat.cs
@@ -0,0 +1,56 @@
+using System.IdentityModel.Tokens.Jwt;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.IdentityModel.Tokens;
+
+namespace BlazorWeb.Server.Services;
+
+/// <summary>
+/// Stores bearer token in jwt format
+/// </summary>
+public class AppSecureJwtDataFormat(AppSettings appSettings, TokenValidationParameters validationParameters)
+    : ISecureDataFormat<AuthenticationTicket>
+{
+    public AuthenticationTicket? Unprotect(string? protectedText)
+        => Unprotect(protectedText, null);
+
+    public AuthenticationTicket? Unprotect(string? protectedText, string? purpose)
+    {
+        try
+        {
+            var handler = new JwtSecurityTokenHandler();
+            ClaimsPrincipal? principal = handler.ValidateToken(protectedText, validationParameters, out var validToken);
+            var validJwt = (JwtSecurityToken)validToken;
+            var data = new AuthenticationTicket(principal, properties: new AuthenticationProperties()
+            {
+                ExpiresUtc = validJwt.ValidTo
+            }, IdentityConstants.BearerScheme);
+            return data;
+        }
+        catch (Exception exp)
+        {
+            throw new UnauthorizedException(nameof(AppStrings.UnauthorizedException), exp);
+        }
+    }
+
+    public string Protect(AuthenticationTicket data) => Protect(data, null);
+
+    public string Protect(AuthenticationTicket data, string? purpose)
+    {
+        var jwtSecurityTokenHandler = new JwtSecurityTokenHandler();
+
+        var securityToken = jwtSecurityTokenHandler
+            .CreateJwtSecurityToken(new SecurityTokenDescriptor
+            {
+                Issuer = appSettings.IdentitySettings.Issuer,
+                Audience = appSettings.IdentitySettings.Audience,
+                IssuedAt = DateTime.UtcNow,
+                Expires = data.Properties.ExpiresUtc!.Value.UtcDateTime,
+                SigningCredentials = new SigningCredentials(validationParameters.IssuerSigningKey, SecurityAlgorithms.RsaSha512),
+                Subject = new ClaimsIdentity(data.Principal.Claims),
+            });
+
+        var encodedJwt = jwtSecurityTokenHandler.WriteToken(securityToken);
+
+        return encodedJwt;
+    }
+}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/Contracts/IJwtService.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/Contracts/IJwtService.cs
deleted file mode 100644
index 7a44730550..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/Contracts/IJwtService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using BlazorWeb.Server.Models.Identity;
-using BlazorWeb.Shared.Dtos.Identity;
-
-namespace BlazorWeb.Server.Services.Contracts;
-
-public interface IJwtService
-{
-    Task<SignInResponseDto> GenerateToken(User user);
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/Contracts/IUserInformationProvider.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/Contracts/IUserInformationProvider.cs
deleted file mode 100644
index 5b11baa5d8..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/Contracts/IUserInformationProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace BlazorWeb.Server.Services.Contracts;
-
-public interface IUserInformationProvider
-{
-    bool IsAuthenticated();
-
-    IEnumerable<Claim> GetClaims();
-
-    ClaimsIdentity GetClaimsIdentity();
-
-    int GetUserId();
-
-    string GetUserName();
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/JwtService.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/JwtService.cs
deleted file mode 100644
index 0c5d501f73..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/JwtService.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using BlazorWeb.Server.Models.Identity;
-using BlazorWeb.Shared.Dtos.Identity;
-using Microsoft.IdentityModel.Tokens;
-
-namespace BlazorWeb.Server.Services;
-
-public partial class JwtService : IJwtService
-{
-    [AutoInject] private readonly SignInManager<User> _signInManager = default!;
-
-    [AutoInject] private readonly AppSettings _appSettings = default!;
-
-    public async Task<SignInResponseDto> GenerateToken(User user)
-    {
-        var certificatePath = Path.Combine(Directory.GetCurrentDirectory(), "IdentityCertificate.pfx");
-        RSA? rsaPrivateKey;
-        using (X509Certificate2 signingCert = new X509Certificate2(certificatePath, _appSettings.JwtSettings.IdentityCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet))
-        {
-            rsaPrivateKey = signingCert.GetRSAPrivateKey();
-        }
-
-        var signingCredentials = new SigningCredentials(new RsaSecurityKey(rsaPrivateKey), SecurityAlgorithms.RsaSha512);
-
-        var claims = (await _signInManager.ClaimsFactory.CreateAsync(user)).Claims;
-
-        var jwtSecurityTokenHandler = new JwtSecurityTokenHandler();
-
-        var securityToken = jwtSecurityTokenHandler
-            .CreateJwtSecurityToken(new SecurityTokenDescriptor
-            {
-                Issuer = _appSettings.JwtSettings.Issuer,
-                Audience = _appSettings.JwtSettings.Audience,
-                IssuedAt = DateTime.UtcNow,
-                NotBefore = DateTime.UtcNow.AddMinutes(_appSettings.JwtSettings.NotBeforeMinutes),
-                Expires = DateTime.UtcNow.AddMinutes(_appSettings.JwtSettings.ExpirationMinutes),
-                SigningCredentials = signingCredentials,
-                Subject = new ClaimsIdentity(claims)
-            });
-
-        return new SignInResponseDto
-        {
-            AccessToken = jwtSecurityTokenHandler.WriteToken(securityToken),
-            ExpiresIn = (long)TimeSpan.FromMinutes(_appSettings.JwtSettings.ExpirationMinutes).TotalSeconds
-        };
-    }
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/ServerSideAuthTokenProvider.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/ServerSideAuthTokenProvider.cs
index 25fc0a92d5..2354b9b741 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/ServerSideAuthTokenProvider.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/ServerSideAuthTokenProvider.cs
@@ -12,20 +12,20 @@ namespace BlazorWeb.Client.Services;
 /// </summary>
 public partial class ServerSideAuthTokenProvider : IAuthTokenProvider
 {
-    [AutoInject] private IJSRuntime _jsRuntime = default!;
     [AutoInject] private IHttpContextAccessor _httpContextAccessor = default!;
+    [AutoInject] private IJSRuntime _jsRuntime = default!;
 
     private static readonly PropertyInfo IsInitializedProp = Assembly.Load("Microsoft.AspNetCore.Components.Server")!
                                                                 .GetType("Microsoft.AspNetCore.Components.Server.Circuits.RemoteJSRuntime")!
                                                                 .GetProperty("IsInitialized")!;
 
+    public bool IsInitialized => (bool)IsInitializedProp.GetValue(_jsRuntime)!;
+
     public async Task<string?> GetAccessTokenAsync()
     {
-        var isInitialized = (bool)IsInitializedProp.GetValue(_jsRuntime)!;
-
-        if (isInitialized)
+        if (IsInitialized)
         {
-            return await _jsRuntime.InvokeAsync<string>("App.getCookie", "access_token");
+            return await _jsRuntime.GetCookie("access_token");
         }
 
         return _httpContextAccessor.HttpContext?.Request.Cookies["access_token"];
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/UserInformationProvider.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/UserInformationProvider.cs
deleted file mode 100644
index 2fe9aae16f..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Services/UserInformationProvider.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-namespace BlazorWeb.Server.Services;
-
-public partial class UserInformationProvider : IUserInformationProvider
-{
-    [AutoInject]
-    public IHttpContextAccessor _httpContextAccessor = default!;
-
-    public IEnumerable<Claim> GetClaims()
-    {
-        if (IsAuthenticated() is false)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return GetClaimsIdentity().Claims;
-    }
-
-    public ClaimsIdentity GetClaimsIdentity()
-    {
-        if (IsAuthenticated() is false)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return (ClaimsIdentity)_httpContextAccessor.HttpContext!.User.Identity!;
-    }
-
-    public int GetUserId()
-    {
-        if (IsAuthenticated() is false)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return _httpContextAccessor.HttpContext!.User.GetUserId();
-    }
-
-    public string GetUserName()
-    {
-        if (IsAuthenticated() is false)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return _httpContextAccessor.HttpContext!.User.GetUserName();
-    }
-
-    public bool IsAuthenticated()
-    {
-        if (_httpContextAccessor.HttpContext is null)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return _httpContextAccessor.HttpContext.User?.Identity?.IsAuthenticated is true;
-    }
-}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Middlewares.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Middlewares.cs
index 74370887ee..65cf5ee7a8 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Middlewares.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Middlewares.cs
@@ -1,10 +1,12 @@
 //-:cnd:noEmit
+using System.Net;
 using System.Reflection;
+using BlazorWeb.Server.Components;
 using HealthChecks.UI.Client;
+using Microsoft.AspNetCore.Components.Endpoints;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Net.Http.Headers;
-using BlazorWeb.Server.Components;
 
 namespace BlazorWeb.Server.Startup;
 
@@ -24,22 +26,7 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
             app.UseResponseCompression();
         }
 
-        app.UseStatusCodePages(options: new()
-        {
-            HandleAsync = async (statusCodeContext) =>
-            {
-                var httpContext = statusCodeContext.HttpContext;
-
-                if (httpContext.Response.StatusCode is 404)
-                {
-                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
-                }
-                else if (httpContext.Response.StatusCode is 401)
-                {
-                    httpContext.Response.Redirect($"/not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
-                }
-            }
-        });
+        Configure_401_403_404_Pages(app);
 
         app.UseStaticFiles(new StaticFileOptions
         {
@@ -92,9 +79,63 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
             app.MapHealthChecksUI();
         }
 
+        // Handle the rest of requests with blazor
         app.MapRazorComponents<App>()
             .AddInteractiveServerRenderMode()
             .AddInteractiveWebAssemblyRenderMode()
             .AddAdditionalAssemblies(Assembly.Load("BlazorWeb.Client"));
     }
+
+    /// <summary>
+    /// Prior to the introduction of .NET 8, the Blazor router effectively managed NotFound and NotAuthorized components during pre-rendering.
+    /// However, the current behavior has changed, and it now exclusively returns 401, 403, and 404 status codes with an empty body response!
+    /// To address this, we've implemented the UseStatusCodePages middleware to handle responses featuring 401, 403, and 404 status codes that lack a body.
+    /// This middleware facilitates redirection to the appropriate not-found and not-authorized pages. Consequently, the status code for these responses becomes 302 (Found).
+    /// To mitigate the challenges posed by this situation, our only recourse is to repurpose the 401, 403, and 404 status codes for
+    /// not-found and not-authorized responses, at the very least.
+    /// </summary>
+    private static void Configure_401_403_404_Pages(WebApplication app)
+    {
+        app.Use(async (context, next) =>
+        {
+            if (context.Request.Path.HasValue)
+            {
+                if (context.Request.Path.Value.Contains("not-found", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
+                if (context.Request.Path.Value.Contains("not-authorized", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    context.Response.StatusCode = context.Request.Query["isForbidden"].FirstOrDefault() is "true" ? (int)HttpStatusCode.Forbidden : (int)HttpStatusCode.Unauthorized;
+                }
+            }
+
+            await next.Invoke(context);
+        });
+
+        app.UseStatusCodePages(options: new()
+        {
+            HandleAsync = async (statusCodeContext) =>
+            {
+                var httpContext = statusCodeContext.HttpContext;
+
+                if (httpContext.Response.StatusCode is 401 or 403 &&
+                    httpContext.GetEndpoint()?.Metadata.OfType<ComponentTypeMetadata>().Any() is true /* The generation of a 401 or 403 status code is attributed to Blazor. */)
+                {
+                    bool is403 = httpContext.Response.StatusCode is 403;
+
+                    httpContext.Response.Redirect($"/not-authorized?redirect-url={httpContext.Request.GetEncodedPathAndQuery()}&isForbidden={(is403 ? "true" : "false")}");
+                }
+                else if (httpContext.Response.StatusCode is 404 &&
+                    httpContext.GetEndpoint() is null /* Please be aware that certain endpoints, particularly those associated with web API actions, may intentionally return a 404 error. */)
+                {
+                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
+                }
+                else
+                {
+                    await statusCodeContext.Next.Invoke(statusCodeContext.HttpContext);
+                }
+            }
+        });
+    }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Services.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Services.cs
index 3eab7b125c..59683dcfb0 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Services.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Services.cs
@@ -2,11 +2,11 @@
 using System.IO.Compression;
 using System.Net;
 using System.Net.Mail;
+using BlazorWeb.Server.Services;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.OData;
 using Microsoft.AspNetCore.ResponseCompression;
-using BlazorWeb.Server.Services;
 
 namespace BlazorWeb.Server.Startup;
 
@@ -20,7 +20,6 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.AddClientSharedServices();
 
-        services.AddScoped<IUserInformationProvider, UserInformationProvider>();
         services.AddExceptionHandler<ApiExceptionHandler>();
 
         services.AddBlazor(configuration);
@@ -78,7 +77,7 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.Configure<AppSettings>(configuration.GetSection(nameof(AppSettings)));
 
-        services.AddScoped(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
+        services.AddTransient(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
 
         services.AddEndpointsApiExplorer();
 
@@ -86,11 +85,9 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.AddIdentity(configuration);
 
-        services.AddJwt(configuration);
-
         services.AddHealthChecks(env, configuration);
 
-        services.AddScoped<HtmlRenderer>();
+        services.AddTransient<HtmlRenderer>();
 
         var fluentEmailServiceBuilder = services.AddFluentEmail(appSettings.EmailSettings.DefaultFromEmail, appSettings.EmailSettings.DefaultFromName);
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/appsettings.json b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/appsettings.json
index f10f1ff5ef..03c3f31c74 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/appsettings.json
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/appsettings.json
@@ -14,22 +14,20 @@
         }
     },
     "AppSettings": {
-        "JwtSettings": {
-            "IdentityCertificatePassword": "P@ssw0rdP@ssw0rd",
+        "IdentitySettings": {
             "Issuer": "BlazorWeb",
             "Audience": "BlazorWeb",
-            "NotBeforeMinutes": "0",
-            "ExpirationMinutes": "1440"
-        },
-        "IdentitySettings": {
+            "IdentityCertificatePassword": "P@ssw0rdP@ssw0rd",
+            "BearerTokenExpiration": "0.01:00:00", //Format: D.HH:mm:ss
+            "RefreshTokenExpiration": "14.00:00:00", //Format: D.HH:mm:ss
             "PasswordRequireDigit": "false",
             "PasswordRequiredLength": "6",
             "PasswordRequireNonAlphanumeric": "false",
             "PasswordRequireUppercase": "false",
             "PasswordRequireLowercase": "false",
             "RequireUniqueEmail": "true",
-            "ConfirmationEmailResendDelay": "0.00:02:00", //Format: D.HH:mm:nn
-            "ResetPasswordEmailResendDelay": "0.00:02:00" //Format: D.HH:mm:nn
+            "ConfirmationEmailResendDelay": "0.00:02:00", //Format: D.HH:mm:ss
+            "ResetPasswordEmailResendDelay": "0.00:02:00" //Format: D.HH:mm:ss
         },
         "EmailSettings": {
             "Host": "LocalFolder", // Local folder means storing emails as .eml file in bin/Debug/net8.0/sent-emails folder (Recommended for testing purposes only) instead of sending them using smtp server.
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/wwwroot/swagger/swagger-utils.js b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/wwwroot/swagger/swagger-utils.js
index 865f82af04..8ad27facd4 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/wwwroot/swagger/swagger-utils.js
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/wwwroot/swagger/swagger-utils.js
@@ -104,6 +104,7 @@ const createLoginUI = function (swagger, rootDiv) {
 
     const userNameInput = document.createElement("input");
     userNameInput.type = "text";
+    userNameInput.placeholder = "test@bitplatform.dev";
     userNameInput.style = "margin-left: 10px; margin-right: 10px;";
     userNameLabel.appendChild(userNameInput);
 
@@ -116,6 +117,7 @@ const createLoginUI = function (swagger, rootDiv) {
     passwordLabel.appendChild(passwordSpan);
 
     const passwordInput = document.createElement("input");
+    passwordInput.placeholder = "123456";
     passwordInput.type = "password";
     passwordInput.style = "margin-left: 10px; margin-right: 10px;";
     passwordLabel.appendChild(passwordInput);
@@ -145,24 +147,24 @@ const createLoginUI = function (swagger, rootDiv) {
 }
 
 const login = async (swagger, userName, password) => {
-    const response = await fetch('/api/Auth/SignIn', {
+    const response = await fetch('/api/Identity/SignIn', {
         headers: { "Content-Type": "application/json; charset=utf-8" },
         method: 'POST',
         body: JSON.stringify({ "userName": userName, "password": password })
     })
     if (response.ok) {
         const result = await response.json();
-        const accessToken = result.accessToken;
+        const access_token = result.accessToken;
         accessTokenExpiresIn = result.expiresIn;
 
-        const authorizationObject = getAuthorizationRequestObject(accessToken);
+        const authorizationObject = getAuthorizationRequestObject(access_token);
         swagger.authActions.authorize(authorizationObject);
     } else {
         alert(await response.text())
     }
 }
 
-const getAuthorizationRequestObject = (accessToken) => {
+const getAuthorizationRequestObject = (access_token) => {
     return {
         "bearerAuth": {
             "name": "Bearer",
@@ -172,7 +174,7 @@ const getAuthorizationRequestObject = (accessToken) => {
                 "name": "Authorization",
                 "in": "header"
             },
-            value: accessToken
+            value: access_token
         },
     };
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/AppJsonContext.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/AppJsonContext.cs
index c795bf6bd8..563361bdfa 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/AppJsonContext.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/AppJsonContext.cs
@@ -1,11 +1,11 @@
 //#if (sample == "Todo")
-using BlazorWeb.Shared.Dtos.Todo;
 //#elif (sample == "AdminPanel")
 using BlazorWeb.Shared.Dtos.Categories;
 using BlazorWeb.Shared.Dtos.Dashboard;
-using BlazorWeb.Shared.Dtos.Products;
 //#endif
 using BlazorWeb.Shared.Dtos.Identity;
+using BlazorWeb.Shared.Dtos.Products;
+using BlazorWeb.Shared.Dtos.Todo;
 
 namespace BlazorWeb.Shared.Dtos;
 
@@ -32,7 +32,8 @@ namespace BlazorWeb.Shared.Dtos;
 [JsonSerializable(typeof(PagedResult<CategoryDto>))]
 //#endif
 [JsonSerializable(typeof(SignInRequestDto))]
-[JsonSerializable(typeof(SignInResponseDto))]
+[JsonSerializable(typeof(RefreshRequestDto))]
+[JsonSerializable(typeof(TokenResponseDto))]
 [JsonSerializable(typeof(SignUpRequestDto))]
 [JsonSerializable(typeof(EditUserDto))]
 [JsonSerializable(typeof(RestErrorInfo))]
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/RefreshRequestDto.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/RefreshRequestDto.cs
new file mode 100644
index 0000000000..8f4adbec73
--- /dev/null
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/RefreshRequestDto.cs
@@ -0,0 +1,8 @@
+namespace BlazorWeb.Shared.Dtos.Identity;
+
+[DtoResourceType(typeof(AppStrings))]
+public class RefreshRequestDto
+{
+    [Required(ErrorMessage = nameof(AppStrings.RequiredAttribute_ValidationError))]
+    public string? RefreshToken { get; set; }
+}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignInRequestDto.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignInRequestDto.cs
index d40576f1e1..614413cafd 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignInRequestDto.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignInRequestDto.cs
@@ -4,7 +4,7 @@ namespace BlazorWeb.Shared.Dtos.Identity;
 [DtoResourceType(typeof(AppStrings))]
 public class SignInRequestDto
 {
-    /// <example>me@gmail.com</example>
+    /// <example>test@bitplatform.dev</example>
     [Required(ErrorMessage = nameof(AppStrings.RequiredAttribute_ValidationError))]
     [EmailAddress(ErrorMessage = nameof(AppStrings.EmailAddressAttribute_ValidationError))]
     [Display(Name = nameof(AppStrings.Email))]
@@ -14,4 +14,8 @@ public class SignInRequestDto
     [Required(ErrorMessage = nameof(AppStrings.RequiredAttribute_ValidationError))]
     [Display(Name = nameof(AppStrings.Password))]
     public string? Password { get; set; }
+
+    [NotMapped]
+    [Display(Name = nameof(AppStrings.RememberMe))]
+    public bool RememberMe { get; set; } = true;
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignUpRequestDto.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignUpRequestDto.cs
index bcc19a0c85..3d1ac93f75 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignUpRequestDto.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignUpRequestDto.cs
@@ -16,7 +16,7 @@ public class SignUpRequestDto
     [MinLength(6, ErrorMessage = nameof(AppStrings.MinLengthAttribute_ValidationError))]
     [Display(Name = nameof(AppStrings.Password))]
     public string? Password { get; set; }
-    
+
     /// <example>true</example>
     [NotMapped]
     [Range(typeof(bool), "true", "true", ErrorMessage = nameof(AppStrings.YouHaveToAcceptTerms))]
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignInResponseDto.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/TokenResponseDto.cs
similarity index 53%
rename from src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignInResponseDto.cs
rename to src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/TokenResponseDto.cs
index 1408f89eae..505618736d 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/SignInResponseDto.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/Identity/TokenResponseDto.cs
@@ -1,10 +1,13 @@
 
 namespace BlazorWeb.Shared.Dtos.Identity;
 
-[DtoResourceType(typeof(AppStrings))]
-public class SignInResponseDto
+public class TokenResponseDto
 {
+    public string? TokenType { get; set; }
+
     public string? AccessToken { get; set; }
 
     public long ExpiresIn { get; set; }
+
+    public string? RefreshToken { get; set; }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/PagedResultDto.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/PagedResultDto.cs
index 3c1936483c..d2a11fdf62 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/PagedResultDto.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Dtos/PagedResultDto.cs
@@ -2,11 +2,11 @@
 
 public class PagedResult<T>
 {
-    public IList<T>? Items { get; set; }
+    public IAsyncEnumerable<T>? Items { get; set; }
 
     public long TotalCount { get; set; }
 
-    public PagedResult(IList<T> items, long totalCount)
+    public PagedResult(IAsyncEnumerable<T> items, long totalCount)
     {
         Items = items;
         TotalCount = totalCount;
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Extensions/ClaimsPrincipalExtensions.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Extensions/ClaimsPrincipalExtensions.cs
index 9929bc0776..1cb124e96e 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Extensions/ClaimsPrincipalExtensions.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Extensions/ClaimsPrincipalExtensions.cs
@@ -4,11 +4,16 @@ public static class ClaimsPrincipalExtensions
 {
     public static int GetUserId(this ClaimsPrincipal claimsPrincipal)
     {
-        return int.Parse(claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)!.Value);
+        return int.Parse((claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier) ?? claimsPrincipal.FindFirst("nameid"))!.Value);
     }
 
     public static string GetUserName(this ClaimsPrincipal claimsPrincipal)
     {
-        return claimsPrincipal.FindFirst(ClaimTypes.Name)!.Value;
+        return (claimsPrincipal.FindFirst(ClaimTypes.Name) ?? claimsPrincipal.FindFirst("unique_name"))!.Value;
+    }
+
+    public static bool IsAuthenticated(this ClaimsPrincipal? claimsPrincipal)
+    {
+        return claimsPrincipal?.Identity?.IsAuthenticated is true;
     }
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Extensions/IServiceCollectionExtensions.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Extensions/IServiceCollectionExtensions.cs
index 729a58761f..c3f4de38dd 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Extensions/IServiceCollectionExtensions.cs
@@ -8,7 +8,7 @@ public static IServiceCollection AddSharedServices(this IServiceCollection servi
     {
         // Services being registered here can get injected everywhere (Api, Web, Android, iOS, Windows, macOS and Linux)
 
-        services.AddSingleton<IDateTimeProvider, DateTimeProvider>();
+        services.AddTransient<IDateTimeProvider, DateTimeProvider>();
 
         services.AddAuthorizationCore();
 
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Mapper.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Mapper.cs
index fc14b0a10c..e3f8df48a1 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Mapper.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Mapper.cs
@@ -2,9 +2,6 @@
 using BlazorWeb.Shared.Dtos.Identity;
 //#if (sample == "Todo")
 using BlazorWeb.Shared.Dtos.Todo;
-//#elif (sample == "AdminPanel")
-using BlazorWeb.Shared.Dtos.Categories;
-using BlazorWeb.Shared.Dtos.Products;
 //#endif
 using Riok.Mapperly.Abstractions;
 
@@ -24,9 +21,6 @@ public static partial class Mapper
 {
     //#if (sample == "Todo")
     public static partial void Patch(this TodoItemDto source, TodoItemDto destination);
-    //#elif (sample == "AdminPanel")
-    public static partial void Patch(this CategoryDto source, CategoryDto destination);
-    public static partial void Patch(this ProductDto source, ProductDto destination);
     //#endif
     public static partial void Patch(this UserDto source, UserDto destination);
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.Designer.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.Designer.cs
index 7341fd53e6..0be2881d16 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.Designer.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.Designer.cs
@@ -943,6 +943,15 @@ public static string RangeAttribute_ValidationError {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Remember me?.
+        /// </summary>
+        public static string RememberMe {
+            get {
+                return ResourceManager.GetString("RememberMe", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Remove.
         /// </summary>
@@ -1304,7 +1313,7 @@ public static string UserImageCouldNotBeFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to User is locked out..
+        ///   Looks up a localized string similar to User is locked out. Try again in {0}.
         /// </summary>
         public static string UserLockedOut {
             get {
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.fr.resx b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.fr.resx
index 2486e7e928..3fcc471bf6 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.fr.resx
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.fr.resx
@@ -139,7 +139,7 @@
     <value>L'e-mail « {0} » est déjà pris.</value>
   </data>
   <data name="UserLockedOut" xml:space="preserve">
-    <value>L'utilisateur est verrouillé.</value>
+    <value>L'utilisateur est verrouillé. Réessayez dans {0}</value>
   </data>
   <data name="UserNameNotFound" xml:space="preserve">
     <value>L'utilisateur {0} n'existe pas.</value>
@@ -423,9 +423,6 @@
   <data name="Submit" xml:space="preserve">
     <value>Soumettre</value>
   </data>
-  <data name="Term" xml:space="preserve">
-    <value>Terme</value>
-  </data>
   <data name="TermsMessage" xml:space="preserve">
     <value>je suis d'accord avec le</value>
   </data>
@@ -552,7 +549,10 @@
   <data name="EditProduct" xml:space="preserve">
     <value>Modifier le produit</value>
   </data>
-    <data name="Dashboard" xml:space="preserve">
+  <data name="Dashboard" xml:space="preserve">
     <value>Tableau de bord</value>
   </data>
+  <data name="RememberMe" xml:space="preserve">
+    <value>Souviens-toi de moi?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.resx b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.resx
index 62717d879c..3e919d348c 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.resx
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/AppStrings.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- +:cnd:noEmit -->
 <root>
-    <!-- 
+  <!-- 
     Microsoft ResX Schema 
     
     Version 2.0
@@ -60,507 +60,507 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string" />
-                            <xsd:attribute name="type" type="xsd:string" />
-                            <xsd:attribute name="mimetype" type="xsd:string" />
-                            <xsd:attribute ref="xml:space" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string" />
-                            <xsd:attribute name="name" type="xsd:string" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-                            <xsd:attribute ref="xml:space" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" />
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <!-- .NET Validation messages -->
-    <data name="CompareAttribute_ValidationError" xml:space="preserve">
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <!-- .NET Validation messages -->
+  <data name="CompareAttribute_ValidationError" xml:space="preserve">
     <value>'{0}' and '{1}' do not match.</value>
   </data>
-    <data name="EmailAddressAttribute_ValidationError" xml:space="preserve">
+  <data name="EmailAddressAttribute_ValidationError" xml:space="preserve">
     <value>The {0} field is not a valid e-mail address.</value>
   </data>
-    <data name="MaxLengthAttribute_InvalidMaxLength" xml:space="preserve">
+  <data name="MaxLengthAttribute_InvalidMaxLength" xml:space="preserve">
     <value>MaxLengthAttribute must have a Length value that is greater than zero. Use MaxLength() without parameters to indicate that the string or array can have the maximum allowable length.</value>
   </data>
-    <data name="MinLengthAttribute_ValidationError" xml:space="preserve">
+  <data name="MinLengthAttribute_ValidationError" xml:space="preserve">
     <value>The field {0} must be a string or array type with a minimum length of '{1}'.</value>
   </data>
-    <data name="RangeAttribute_ValidationError" xml:space="preserve">
+  <data name="RangeAttribute_ValidationError" xml:space="preserve">
     <value>The field {0} must be between {1} and {2}.</value>
   </data>
-    <data name="RequiredAttribute_ValidationError" xml:space="preserve">
+  <data name="RequiredAttribute_ValidationError" xml:space="preserve">
     <value>The {0} field is required.</value>
   </data>
-    <!-- Exceptions -->
-    <data name="BadRequestException" xml:space="preserve">
+  <!-- Exceptions -->
+  <data name="BadRequestException" xml:space="preserve">
     <value>Invalid request</value>
   </data>
-    <data name="ConflicException" xml:space="preserve">
+  <data name="ConflicException" xml:space="preserve">
     <value>Request could not be processed because of conflict in the request</value>
   </data>
-    <data name="ForbiddenException" xml:space="preserve">
+  <data name="ForbiddenException" xml:space="preserve">
     <value>Access to the requested resource is forbidden</value>
   </data>
-    <data name="ResourceValidationException" xml:space="preserve">
+  <data name="ResourceValidationException" xml:space="preserve">
     <value>Request data is not valid</value>
   </data>
-    <data name="RestException" xml:space="preserve">
+  <data name="RestException" xml:space="preserve">
     <value>An error occurred while communicating with server</value>
   </data>
-    <data name="UnauthorizedException" xml:space="preserve">
+  <data name="UnauthorizedException" xml:space="preserve">
     <value>Your request lacks valid authentication credentials</value>
   </data>
-    <data name="UnknownException" xml:space="preserve">
+  <data name="UnknownException" xml:space="preserve">
     <value>Unknown error has occurred</value>
   </data>
-    <data name="UpdateConcurrencyException" xml:space="preserve">
+  <data name="UpdateConcurrencyException" xml:space="preserve">
     <value>The record was modified by another user after you got the original data. the operation was canceled.</value>
   </data>
-    <data name="ResourceNotFoundException" xml:space="preserve">
+  <data name="ResourceNotFoundException" xml:space="preserve">
     <value>Resource not found</value>
   </data>
-    <data name="TooManyRequestsExceptions" xml:space="preserve">
+  <data name="TooManyRequestsExceptions" xml:space="preserve">
     <value>Too many requests</value>
   </data>
-    <data name="ServerConnectionException" xml:space="preserve">
+  <data name="ServerConnectionException" xml:space="preserve">
     <value>Unable to connect to server.</value>
   </data>
-    <!-- BlazorWeb strings -->
-    <data name="Active" xml:space="preserve">
+  <!-- BlazorWeb strings -->
+  <data name="Active" xml:space="preserve">
     <value>Active</value>
   </data>
-    <data name="All" xml:space="preserve">
+  <data name="All" xml:space="preserve">
     <value>All</value>
   </data>
-    <data name="Alphabetical" xml:space="preserve">
+  <data name="Alphabetical" xml:space="preserve">
     <value>Alphabetical</value>
   </data>
-    <data name="Completed" xml:space="preserve">
+  <data name="Completed" xml:space="preserve">
     <value>Completed</value>
   </data>
-    <data name="Date" xml:space="preserve">
+  <data name="Date" xml:space="preserve">
     <value>Date</value>
   </data>
-    <data name="EditProfileTitle" xml:space="preserve">
+  <data name="EditProfileTitle" xml:space="preserve">
     <value>Edit profile</value>
   </data>
-    <data name="FullName" xml:space="preserve">
+  <data name="FullName" xml:space="preserve">
     <value>FullName</value>
   </data>
-    <data name="TermsTitle" xml:space="preserve">
+  <data name="TermsTitle" xml:space="preserve">
     <value>Terms</value>
   </data>
-    <data name="ProfileUpdatedSuccessfullyMessage" xml:space="preserve">
+  <data name="ProfileUpdatedSuccessfullyMessage" xml:space="preserve">
     <value>Profile updated successfully.</value>
   </data>
-    <data name="ConfirmNewPassword" xml:space="preserve">
+  <data name="ConfirmNewPassword" xml:space="preserve">
     <value>Confirm New Password</value>
   </data>
-    <data name="Email" xml:space="preserve">
+  <data name="Email" xml:space="preserve">
     <value>Email</value>
   </data>
-    <data name="Password" xml:space="preserve">
+  <data name="Password" xml:space="preserve">
     <value>Password</value>
   </data>
-    <data name="PasswordChangedSuccessfullyMessage" xml:space="preserve">
+  <data name="PasswordChangedSuccessfullyMessage" xml:space="preserve">
     <value>Your password changed successfully.</value>
   </data>
-    <data name="ResendConfirmationLinkMessage" xml:space="preserve">
+  <data name="ResendConfirmationLinkMessage" xml:space="preserve">
     <value>The confirmation link has been re-sent to your email address.</value>
   </data>
-    <data name="ResetPasswordLinkSentMessage" xml:space="preserve">
+  <data name="ResetPasswordLinkSentMessage" xml:space="preserve">
     <value>The reset password link has been sent to your email address.</value>
   </data>
-    <data name="UserImageCouldNotBeFound" xml:space="preserve">
+  <data name="UserImageCouldNotBeFound" xml:space="preserve">
     <value>User image could not be found</value>
   </data>
-    <data name="Error" xml:space="preserve">
+  <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
-    <data name="WaitForResetPasswordEmailResendDelay" xml:space="preserve">
+  <data name="WaitForResetPasswordEmailResendDelay" xml:space="preserve">
     <value>You have already requested the reset password email. Try again in {0}</value>
   </data>
-    <data name="TermsAccepted" xml:space="preserve">
+  <data name="TermsAccepted" xml:space="preserve">
     <value>Is accept terms?</value>
   </data>
-    <data name="YouHaveToAcceptTerms" xml:space="preserve">
+  <data name="YouHaveToAcceptTerms" xml:space="preserve">
     <value>You must agree to our terms.</value>
   </data>
-    <data name="Gender" xml:space="preserve">
+  <data name="Gender" xml:space="preserve">
     <value>Gender</value>
   </data>
-    <data name="BirthDate" xml:space="preserve">
+  <data name="BirthDate" xml:space="preserve">
     <value>Birthdate</value>
   </data>
-    <data name="Name" xml:space="preserve">
+  <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
-    <data name="Description" xml:space="preserve">
+  <data name="Description" xml:space="preserve">
     <value>Description</value>
   </data>
-    <data name="Price" xml:space="preserve">
+  <data name="Price" xml:space="preserve">
     <value>Price</value>
   </data>
-    <data name="YouNeedToSignIn" xml:space="preserve">
+  <data name="YouNeedToSignIn" xml:space="preserve">
     <value>You must be signed in to continue.</value>
   </data>
-    <data name="InvalidUsernameOrPassword" xml:space="preserve">
+  <data name="InvalidUsernameOrPassword" xml:space="preserve">
     <value>Invalid username or password</value>
   </data>
-    <data name="WaitForConfirmationEmailResendDelay" xml:space="preserve">
+  <data name="WaitForConfirmationEmailResendDelay" xml:space="preserve">
     <value>You have already requested the confirmation email. Try again in {0}</value>
   </data>
-    <data name="EmailAlreadyConfirmed" xml:space="preserve">
+  <data name="EmailAlreadyConfirmed" xml:space="preserve">
     <value>Your email is already confirmed.</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Title</value>
   </data>
-    <data name="AreYouSureWannaDelete" xml:space="preserve">
+  <data name="AreYouSureWannaDelete" xml:space="preserve">
     <value>Are you sure you want to delete {0}</value>
   </data>
-    <data name="Home" xml:space="preserve">
+  <data name="Home" xml:space="preserve">
     <value>Home</value>
   </data>
-    <data name="UserLockedOut" xml:space="preserve">
-      <value>User is locked out.</value>
+  <data name="UserLockedOut" xml:space="preserve">
+      <value>User is locked out. Try again in {0}</value>
     </data>
-    <data name="UserNameNotFound" xml:space="preserve">
+  <data name="UserNameNotFound" xml:space="preserve">
       <value>User {0} does not exist.</value>
     </data>
-    <data name="DuplicateEmail" xml:space="preserve">
+  <data name="DuplicateEmail" xml:space="preserve">
       <value>Email '{0}' is already taken.</value>
     </data>
-    <data name="Add" xml:space="preserve">
+  <data name="Add" xml:space="preserve">
     <value>Add</value>
   </data>
-    <data name="AlreadyHaveAccountMessage" xml:space="preserve">
+  <data name="AlreadyHaveAccountMessage" xml:space="preserve">
     <value>Already have an account?</value>
   </data>
-    <data name="ConfirmEmailMessage" xml:space="preserve">
+  <data name="ConfirmEmailMessage" xml:space="preserve">
     <value>We have sent a confirmation link to your email address.
 Please confirm your email by clicking on the link.</value>
   </data>
-    <data name="ConfirmEmailTitle" xml:space="preserve">
+  <data name="ConfirmEmailTitle" xml:space="preserve">
     <value>Confirm Your Email Address</value>
   </data>
-    <data name="DeleteAccount" xml:space="preserve">
+  <data name="DeleteAccount" xml:space="preserve">
     <value>Delete Account</value>
   </data>
-    <data name="DeleteAccountPrompt" xml:space="preserve">
+  <data name="DeleteAccountPrompt" xml:space="preserve">
     <value>Are you sure you want to delete your account?</value>
   </data>
-    <data name="DontHaveAccountMessage" xml:space="preserve">
+  <data name="DontHaveAccountMessage" xml:space="preserve">
     <value>Don’t have an account?</value>
   </data>
-    <data name="Edit" xml:space="preserve">
+  <data name="Edit" xml:space="preserve">
     <value>Edit</value>
   </data>
-    <data name="EmailConfirmationFailedMessage" xml:space="preserve">
+  <data name="EmailConfirmationFailedMessage" xml:space="preserve">
     <value>Email Confirmation Failed!</value>
   </data>
-    <data name="EmailConfirmationTitle" xml:space="preserve">
+  <data name="EmailConfirmationTitle" xml:space="preserve">
     <value>Email Confirmation</value>
   </data>
-    <data name="EmailConfirmedSuccessfullyMessage" xml:space="preserve">
+  <data name="EmailConfirmedSuccessfullyMessage" xml:space="preserve">
     <value>Email Confirmed Successfully!</value>
   </data>
-    <data name="FileUploadFailed" xml:space="preserve">
+  <data name="FileUploadFailed" xml:space="preserve">
     <value>An error occurred while uploading file</value>
   </data>
-    <data name="ForgetPasswordMessage" xml:space="preserve">
+  <data name="ForgetPasswordMessage" xml:space="preserve">
     <value>Please enter the email address you have been signed up with so we can send a reset password link to your email address.</value>
   </data>
-    <data name="ForgetPasswordTitle" xml:space="preserve">
+  <data name="ForgetPasswordTitle" xml:space="preserve">
     <value>Forget password</value>
   </data>
-    <data name="GenderMale" xml:space="preserve">
+  <data name="GenderMale" xml:space="preserve">
     <value>Male</value>
   </data>
-    <data name="GenderOther" xml:space="preserve">
+  <data name="GenderOther" xml:space="preserve">
     <value>Other</value>
   </data>
-    <data name="GitHubRepo" xml:space="preserve">
+  <data name="GitHubRepo" xml:space="preserve">
     <value>GitHub Repo</value>
   </data>
-    <data name="GoToToday" xml:space="preserve">
+  <data name="GoToToday" xml:space="preserve">
     <value>Go to today</value>
   </data>
-    <data name="HomeMessage" xml:space="preserve">
+  <data name="HomeMessage" xml:space="preserve">
     <value>Create your multi-mode (WASM, Server, Hybrid, pre-rendering) Blazor app easily in the shortest time ever!</value>
   </data>
-    <data name="HomeTitle" xml:space="preserve">
+  <data name="HomeTitle" xml:space="preserve">
     <value>BlazorWeb Home</value>
   </data>
-    <data name="InvalidConfirmationLinkMessage" xml:space="preserve">
+  <data name="InvalidConfirmationLinkMessage" xml:space="preserve">
     <value>Looks like the confirmation link either is invalid or has expired.</value>
   </data>
-    <data name="NewPassword" xml:space="preserve">
+  <data name="NewPassword" xml:space="preserve">
     <value>New Password</value>
   </data>
-    <data name="No" xml:space="preserve">
+  <data name="No" xml:space="preserve">
     <value>No</value>
   </data>
-    <data name="NotReceivedConfirmationEmailMessage" xml:space="preserve">
+  <data name="NotReceivedConfirmationEmailMessage" xml:space="preserve">
     <value>Haven’t you received the confirmation email?</value>
   </data>
-    <data name="Or" xml:space="preserve">
+  <data name="Or" xml:space="preserve">
     <value>OR</value>
   </data>
-    <data name="ProfileImage" xml:space="preserve">
+  <data name="ProfileImage" xml:space="preserve">
     <value>Profile Image</value>
   </data>
-    <data name="Remove" xml:space="preserve">
+  <data name="Remove" xml:space="preserve">
     <value>Remove</value>
   </data>
-    <data name="ResendEmail" xml:space="preserve">
+  <data name="ResendEmail" xml:space="preserve">
     <value>Resend email</value>
   </data>
-    <data name="ResetPasswordTitle" xml:space="preserve">
+  <data name="ResetPasswordTitle" xml:space="preserve">
     <value>Reset password</value>
   </data>
-    <data name="Save" xml:space="preserve">
+  <data name="Save" xml:space="preserve">
     <value>Save</value>
   </data>
-    <data name="SignInTitle" xml:space="preserve">
+  <data name="SignInTitle" xml:space="preserve">
     <value>Sign in</value>
   </data>
-    <data name="SignOut" xml:space="preserve">
+  <data name="SignOut" xml:space="preserve">
     <value>Sign out</value>
   </data>
-    <data name="SignOutPrompt" xml:space="preserve">
+  <data name="SignOutPrompt" xml:space="preserve">
     <value>Are you sure you want to Sign out?</value>
   </data>
-    <data name="SignUp" xml:space="preserve">
+  <data name="SignUp" xml:space="preserve">
     <value>Sign up</value>
   </data>
-    <data name="SingUpTitle" xml:space="preserve">
+  <data name="SingUpTitle" xml:space="preserve">
     <value>Sign up</value>
   </data>
-    <data name="Submit" xml:space="preserve">
+  <data name="Submit" xml:space="preserve">
     <value>Submit</value>
   </data>
-    <data name="Term" xml:space="preserve">
-    <value>Term</value>
-  </data>
-    <data name="TermsMessage" xml:space="preserve">
+  <data name="TermsMessage" xml:space="preserve">
     <value>I agree to the</value>
   </data>
-    <data name="UploadNewProfileImage" xml:space="preserve">
+  <data name="UploadNewProfileImage" xml:space="preserve">
     <value>Upload a new profile image</value>
   </data>
-    <data name="Yes" xml:space="preserve">
+  <data name="Yes" xml:space="preserve">
     <value>Yes</value>
   </data>
-    <data name="SelectBirthDate" xml:space="preserve">
+  <data name="SelectBirthDate" xml:space="preserve">
     <value>Select your birth date</value>
   </data>
-    <data name="ResetPassword" xml:space="preserve">
+  <data name="ResetPassword" xml:space="preserve">
     <value>Reset password</value>
   </data>
-    <data name="Action" xml:space="preserve">
+  <data name="Action" xml:space="preserve">
     <value>Action</value>
   </data>
-    <data name="Back" xml:space="preserve">
+  <data name="Back" xml:space="preserve">
     <value>Back</value>
   </data>
-    <data name="Cancel" xml:space="preserve">
+  <data name="Cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
-    <data name="CheckSpamMailMessage" xml:space="preserve">
+  <data name="CheckSpamMailMessage" xml:space="preserve">
     <value>Check your Spam/Junk, if you could not find it in the Inbox.</value>
   </data>
-    <data name="Color" xml:space="preserve">
+  <data name="Color" xml:space="preserve">
     <value>Color</value>
   </data>
-    <data name="CustomColor" xml:space="preserve">
+  <data name="CustomColor" xml:space="preserve">
     <value>Custom color</value>
   </data>
-    <data name="Delete" xml:space="preserve">
+  <data name="Delete" xml:space="preserve">
     <value>Delete</value>
   </data>
-    <data name="Id" xml:space="preserve">
+  <data name="Id" xml:space="preserve">
     <value>Id</value>
   </data>
-    <data name="SignIn" xml:space="preserve">
+  <data name="SignIn" xml:space="preserve">
     <value>Sign in</value>
   </data>
-    <data name="SignInAsDifferentUser" xml:space="preserve">
+  <data name="SignInAsDifferentUser" xml:space="preserve">
     <value>Sign in as different user</value>
   </data>
-    <data name="YouAreSignInAs" xml:space="preserve">
+  <data name="YouAreSignInAs" xml:space="preserve">
     <value>You're sign in as</value>
   </data>
-    <data name="ForgotPasswordLink" xml:space="preserve">
+  <data name="ForgotPasswordLink" xml:space="preserve">
     <value>Forgot password?</value>
   </data>
-    <data name="GenderFemale" xml:space="preserve">
+  <data name="GenderFemale" xml:space="preserve">
     <value>Female</value>
   </data>
-    <!--#if (sample == "Todo") -->
-    <data name="TodoAddPlaceholder" xml:space="preserve">
+  <data name="RememberMe" xml:space="preserve">
+    <value>Remember me?</value>
+  </data>
+  <!--#if (sample == "Todo") -->
+  <data name="TodoAddPlaceholder" xml:space="preserve">
     <value>Add a todo</value>
   </data>
-    <data name="NoTodos" xml:space="preserve">
+  <data name="NoTodos" xml:space="preserve">
     <value>No todos yet</value>
   </data>
-    <data name="TodoSearchPlaceholder" xml:space="preserve">
+  <data name="TodoSearchPlaceholder" xml:space="preserve">
     <value>Search some todo...</value>
   </data>
-    <data name="ToDoItemCouldNotBeFound" xml:space="preserve">
+  <data name="ToDoItemCouldNotBeFound" xml:space="preserve">
     <value>Todo item could not be found</value>
   </data>
-    <data name="TodoTitle" xml:space="preserve">
+  <data name="TodoTitle" xml:space="preserve">
     <value>Todo</value>
   </data>
-    <data name="DeleteTodoItem" xml:space="preserve">
+  <data name="DeleteTodoItem" xml:space="preserve">
     <value>Delete todo item</value>
   </data>
-    <!--#elif (sample == "AdminPanel") -->
-    <data name="Last30DaysProductCount" xml:space="preserve">
+  <!--#elif (sample == "AdminPanel") -->
+  <data name="Last30DaysProductCount" xml:space="preserve">
     <value>Last 30 days product count</value>
   </data>
-    <data name="AddProduct" xml:space="preserve">
+  <data name="AddProduct" xml:space="preserve">
     <value>Add product</value>
   </data>
-    <data name="SelectCategory" xml:space="preserve">
+  <data name="SelectCategory" xml:space="preserve">
     <value>Select category</value>
   </data>
-    <data name="TotalCategories" xml:space="preserve">
+  <data name="TotalCategories" xml:space="preserve">
     <value>Total categories</value>
   </data>
-    <data name="TotalProducts" xml:space="preserve">
+  <data name="TotalProducts" xml:space="preserve">
     <value>Total products</value>
   </data>
-    <data name="EditCategory" xml:space="preserve">
+  <data name="EditCategory" xml:space="preserve">
     <value>Edit category</value>
   </data>
-    <data name="AddCategory" xml:space="preserve">
+  <data name="AddCategory" xml:space="preserve">
     <value>New category</value>
   </data>
-    <data name="CategoriesPageTitle" xml:space="preserve">
+  <data name="CategoriesPageTitle" xml:space="preserve">
     <value>Categories</value>
   </data>
-    <data name="EnterCategoryName" xml:space="preserve">
+  <data name="EnterCategoryName" xml:space="preserve">
     <value>Enter category name</value>
   </data>
-    <data name="EnterProductName" xml:space="preserve">
+  <data name="EnterProductName" xml:space="preserve">
     <value>Enter product name</value>
   </data>
-    <data name="Last30DaysCategoryCount" xml:space="preserve">
+  <data name="Last30DaysCategoryCount" xml:space="preserve">
     <value>Last 30 days category count</value>
   </data>
-    <data name="ProductSales" xml:space="preserve">
+  <data name="ProductSales" xml:space="preserve">
     <value>Product sales</value>
   </data>
-    <data name="ProductSalesText" xml:space="preserve">
+  <data name="ProductSalesText" xml:space="preserve">
     <value>This chart shows the sale number of each product.</value>
   </data>
-    <data name="SearchOnName" xml:space="preserve">
+  <data name="SearchOnName" xml:space="preserve">
     <value>Search on name</value>
   </data>
-    <data name="ProductsCountPerCategoryChart" xml:space="preserve">
+  <data name="ProductsCountPerCategoryChart" xml:space="preserve">
     <value>Products count per category chart</value>
   </data>
-    <data name="ProductsCountPerCategoryChartText" xml:space="preserve">
+  <data name="ProductsCountPerCategoryChartText" xml:space="preserve">
     <value>This chart shows the number of products in each category.</value>
   </data>
-    <data name="ProductsPageTitle" xml:space="preserve">
+  <data name="ProductsPageTitle" xml:space="preserve">
     <value>Products</value>
   </data>
-    <data name="ProductsPercentagePerCategory" xml:space="preserve">
+  <data name="ProductsPercentagePerCategory" xml:space="preserve">
     <value>Products percentage per category</value>
   </data>
-    <data name="ProductsPercentagePerCategoryText" xml:space="preserve">
+  <data name="ProductsPercentagePerCategoryText" xml:space="preserve">
     <value>This chart shows the percentage of products in each category.</value>
   </data>
-    <data name="Categories" xml:space="preserve">
+  <data name="Categories" xml:space="preserve">
   <value>Categories</value>
 </data>
-    <data name="ProductCategory" xml:space="preserve">
+  <data name="ProductCategory" xml:space="preserve">
   <value>Product category</value>
 </data>
-    <data name="Products" xml:space="preserve">
+  <data name="Products" xml:space="preserve">
   <value>Products</value>
 </data>
-    <data name="ProductCouldNotBeFound" xml:space="preserve">
+  <data name="ProductCouldNotBeFound" xml:space="preserve">
   <value>Product entity could not be found</value>
 </data>
-    <data name="CategoryNotEmpty" xml:space="preserve">
+  <data name="CategoryNotEmpty" xml:space="preserve">
   <value>This category contain some products, so you can't delete it</value>
 </data>
-    <data name="AreYouSureWannaDeleteCategory" xml:space="preserve">
+  <data name="AreYouSureWannaDeleteCategory" xml:space="preserve">
   <value>Are you sure you want to delete category {0}</value>
 </data>
-    <data name="AreYouSureWannaDeleteProduct" xml:space="preserve">
+  <data name="AreYouSureWannaDeleteProduct" xml:space="preserve">
   <value>Are you sure you want to delete product {0}</value>
 </data>
-    <data name="DeleteCategory" xml:space="preserve">
+  <data name="DeleteCategory" xml:space="preserve">
   <value>Delete category</value>
 </data>
-    <data name="DeleteProduct" xml:space="preserve">
+  <data name="DeleteProduct" xml:space="preserve">
   <value>Delete product</value>
 </data>
-    <data name="CategoryCouldNotBeFound" xml:space="preserve">
+  <data name="CategoryCouldNotBeFound" xml:space="preserve">
     <value>Category entity could not be found</value>
   </data>
-    <data name="Category" xml:space="preserve">
+  <data name="Category" xml:space="preserve">
     <value>Category</value>
   </data>
-    <data name="DefaultColorPicker" xml:space="preserve">
+  <data name="DefaultColorPicker" xml:space="preserve">
     <value>Default color picker</value>
   </data>
-    <data name="EditProduct" xml:space="preserve">
+  <data name="EditProduct" xml:space="preserve">
     <value>Edit product</value>
   </data>
-    <data name="Dashboard" xml:space="preserve">
+  <data name="Dashboard" xml:space="preserve">
     <value>Dashboard</value>
   </data>
-    <!--#endif -->
+  <!--#endif -->
 </root>
\ No newline at end of file
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.Designer.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.Designer.cs
index a06c4d199d..55787e36aa 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.Designer.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.Designer.cs
@@ -114,33 +114,6 @@ public static string InvalidEmail {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} must derive from {1}&lt;{2}&gt;..
-        /// </summary>
-        public static string InvalidManagerType {
-            get {
-                return ResourceManager.GetString("InvalidManagerType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The provided PasswordHasherCompatibilityMode is invalid..
-        /// </summary>
-        public static string InvalidPasswordHasherCompatibilityMode {
-            get {
-                return ResourceManager.GetString("InvalidPasswordHasherCompatibilityMode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The iteration count must be a positive integer..
-        /// </summary>
-        public static string InvalidPasswordHasherIterationCount {
-            get {
-                return ResourceManager.GetString("InvalidPasswordHasherIterationCount", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Role name &apos;{0}&apos; is invalid..
         /// </summary>
@@ -177,51 +150,6 @@ public static string LoginAlreadyAssociated {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to AddIdentity must be called on the service collection..
-        /// </summary>
-        public static string MustCallAddIdentity {
-            get {
-                return ResourceManager.GetString("MustCallAddIdentity", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No IPersonalDataProtector service was registered, this is required when ProtectPersonalData = true..
-        /// </summary>
-        public static string NoPersonalDataProtector {
-            get {
-                return ResourceManager.GetString("NoPersonalDataProtector", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No RoleType was specified, try AddRoles&lt;TRole&gt;()..
-        /// </summary>
-        public static string NoRoleType {
-            get {
-                return ResourceManager.GetString("NoRoleType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No IUserTwoFactorTokenProvider&lt;{0}&gt; named &apos;{1}&apos; is registered..
-        /// </summary>
-        public static string NoTokenProvider {
-            get {
-                return ResourceManager.GetString("NoTokenProvider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to User security stamp cannot be null..
-        /// </summary>
-        public static string NullSecurityStamp {
-            get {
-                return ResourceManager.GetString("NullSecurityStamp", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Incorrect password..
         /// </summary>
@@ -294,168 +222,6 @@ public static string RecoveryCodeRedemptionFailed {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Role {0} does not exist..
-        /// </summary>
-        public static string RoleNotFound {
-            get {
-                return ResourceManager.GetString("RoleNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IProtectedUserStore&lt;TUser&gt; which is required when ProtectPersonalData = true..
-        /// </summary>
-        public static string StoreNotIProtectedUserStore {
-            get {
-                return ResourceManager.GetString("StoreNotIProtectedUserStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IQueryableRoleStore&lt;TRole&gt;..
-        /// </summary>
-        public static string StoreNotIQueryableRoleStore {
-            get {
-                return ResourceManager.GetString("StoreNotIQueryableRoleStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IQueryableUserStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIQueryableUserStore {
-            get {
-                return ResourceManager.GetString("StoreNotIQueryableUserStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IRoleClaimStore&lt;TRole&gt;..
-        /// </summary>
-        public static string StoreNotIRoleClaimStore {
-            get {
-                return ResourceManager.GetString("StoreNotIRoleClaimStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserAuthenticationTokenStore&lt;User&gt;..
-        /// </summary>
-        public static string StoreNotIUserAuthenticationTokenStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserAuthenticationTokenStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserAuthenticatorKeyStore&lt;User&gt;..
-        /// </summary>
-        public static string StoreNotIUserAuthenticatorKeyStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserAuthenticatorKeyStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserClaimStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserClaimStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserClaimStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserConfirmationStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserConfirmationStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserConfirmationStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserEmailStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserEmailStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserEmailStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserLockoutStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserLockoutStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserLockoutStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserLoginStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserLoginStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserLoginStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserPasswordStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserPasswordStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserPasswordStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserPhoneNumberStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserPhoneNumberStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserPhoneNumberStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserRoleStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserRoleStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserRoleStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserSecurityStampStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserSecurityStampStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserSecurityStampStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserTwoFactorRecoveryCodeStore&lt;User&gt;..
-        /// </summary>
-        public static string StoreNotIUserTwoFactorRecoveryCodeStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserTwoFactorRecoveryCodeStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Store does not implement IUserTwoFactorStore&lt;TUser&gt;..
-        /// </summary>
-        public static string StoreNotIUserTwoFactorStore {
-            get {
-                return ResourceManager.GetString("StoreNotIUserTwoFactorStore", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to User already has a password set..
         /// </summary>
@@ -474,15 +240,6 @@ public static string UserAlreadyInRole {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to User is locked out..
-        /// </summary>
-        public static string UserLockedOut {
-            get {
-                return ResourceManager.GetString("UserLockedOut", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Lockout is not enabled for this user..
         /// </summary>
@@ -492,15 +249,6 @@ public static string UserLockoutNotEnabled {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to User {0} does not exist..
-        /// </summary>
-        public static string UserNameNotFound {
-            get {
-                return ResourceManager.GetString("UserNameNotFound", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to User is not in role &apos;{0}&apos;..
         /// </summary>
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.fr.resx b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.fr.resx
index f8293653b4..93df6df881 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.fr.resx
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.fr.resx
@@ -135,15 +135,6 @@
   <data name="InvalidEmail" xml:space="preserve">
     <value>L'e-mail « {0} » n'est pas valide.</value>
   </data>
-  <data name="InvalidManagerType" xml:space="preserve">
-    <value>Le type {0} doit dériver de {1}&lt;{2}&gt;.</value>
-  </data>
-  <data name="InvalidPasswordHasherCompatibilityMode" xml:space="preserve">
-    <value>Le PasswordHasherCompatibilityMode fourni n’est pas valide.</value>
-  </data>
-  <data name="InvalidPasswordHasherIterationCount" xml:space="preserve">
-    <value>Le nombre d'itérations doit être un entier positif.</value>
-  </data>
   <data name="InvalidRoleName" xml:space="preserve">
     <value>Le nom de rôle « {0} » n'est pas valide.</value>
   </data>
@@ -156,15 +147,6 @@
   <data name="LoginAlreadyAssociated" xml:space="preserve">
     <value>Un utilisateur avec cette connexion existe déjà.</value>
   </data>
-  <data name="MustCallAddIdentity" xml:space="preserve">
-    <value>AddIdentity doit être appelé sur la collection de services.</value>
-  </data>
-  <data name="NoTokenProvider" xml:space="preserve">
-    <value>Aucun IUserTwoFactorTokenProvider&lt;{0}&gt; nommé '{1}' n'est enregistré.</value>
-  </data>
-  <data name="NullSecurityStamp" xml:space="preserve">
-    <value>Le cachet de sécurité de l'utilisateur ne peut pas être nul.</value>
-  </data>
   <data name="PasswordMismatch" xml:space="preserve">
     <value>Mot de passe incorrect.</value>
   </data>
@@ -183,54 +165,6 @@
   <data name="PasswordTooShort" xml:space="preserve">
     <value>Les mots de passe doivent comporter au moins {0} caractères.</value>
   </data>
-  <data name="RoleNotFound" xml:space="preserve">
-    <value>Le rôle {0} n'existe pas.</value>
-  </data>
-  <data name="StoreNotIQueryableRoleStore" xml:space="preserve">
-    <value>Store n’implémente pas IQueryableRoleStore&lt;TRole&gt;.</value>
-  </data>
-  <data name="StoreNotIQueryableUserStore" xml:space="preserve">
-    <value>Store n’implémente pas IQueryableUserStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIRoleClaimStore" xml:space="preserve">
-    <value>Store n’implémente pas IRoleClaimStore&lt;TRole&gt;.</value>
-  </data>
-  <data name="StoreNotIUserAuthenticationTokenStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserAuthenticationTokenStore&lt;User&gt;.</value>
-  </data>
-  <data name="StoreNotIUserClaimStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserClaimStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserConfirmationStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserConfirmationStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserEmailStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserEmailStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserLockoutStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserLockoutStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserLoginStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserLoginStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserPasswordStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserPasswordStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserPhoneNumberStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserPhoneNumberStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserRoleStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserRoleStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserSecurityStampStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserSecurityStampStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserAuthenticatorKeyStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserAuthenticatorKeyStore&lt;User&gt;.</value>
-  </data>
-  <data name="StoreNotIUserTwoFactorStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserTwoFactorStore&lt;TUser&gt;.</value>
-  </data>
   <data name="RecoveryCodeRedemptionFailed" xml:space="preserve">
     <value>L'utilisation du code de récupération a échoué.</value>
   </data>
@@ -240,31 +174,13 @@
   <data name="UserAlreadyInRole" xml:space="preserve">
     <value>Utilisateur déjà dans le rôle « {0} ».</value>
   </data>
-  <data name="UserLockedOut" xml:space="preserve">
-    <value>L'utilisateur est verrouillé.</value>
-  </data>
   <data name="UserLockoutNotEnabled" xml:space="preserve">
     <value>Le verrouillage n'est pas activé pour cet utilisateur.</value>
   </data>
-  <data name="UserNameNotFound" xml:space="preserve">
-    <value>L'utilisateur {0} n'existe pas.</value>
-  </data>
   <data name="UserNotInRole" xml:space="preserve">
     <value>L'utilisateur n'a pas le rôle « {0} ».</value>
   </data>
-  <data name="StoreNotIUserTwoFactorRecoveryCodeStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserTwoFactorRecoveryCodeStore&lt;User&gt;.</value>
-  </data>
   <data name="PasswordRequiresUniqueChars" xml:space="preserve">
     <value>Les mots de passe doivent utiliser au moins {0} caractères différents.</value>
   </data>
-  <data name="NoRoleType" xml:space="preserve">
-    <value>Aucun RoleType n'a été spécifié, essayez AddRoles&lt;TRole&gt;().</value>
-  </data>
-  <data name="StoreNotIProtectedUserStore" xml:space="preserve">
-    <value>Store n’implémente pas IProtectedUserStore&lt;TUser&gt; qui est requis lorsque ProtectPersonalData = true.</value>
-  </data>
-  <data name="NoPersonalDataProtector" xml:space="preserve">
-    <value>Aucun service IPersonalDataProtector n'a été enregistré, cela est requis lorsque ProtectPersonalData = true.</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.resx b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.resx
index b90af58bd7..c7dfef04d2 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.resx
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Resources/IdentityStrings.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
     Microsoft ResX Schema 
     
     Version 2.0
@@ -59,263 +59,150 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string" />
-                            <xsd:attribute name="type" type="xsd:string" />
-                            <xsd:attribute name="mimetype" type="xsd:string" />
-                            <xsd:attribute ref="xml:space" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string" />
-                            <xsd:attribute name="name" type="xsd:string" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-                            <xsd:attribute ref="xml:space" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" />
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <!-- ASP.NET Core Identity messages -->
-    <data name="ConcurrencyFailure" xml:space="preserve">
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ConcurrencyFailure" xml:space="preserve">
     <value>Optimistic concurrency failure, object has been modified.</value>
     <comment>Error when optimistic concurrency fails</comment>
   </data>
-    <data name="DefaultError" xml:space="preserve">
+  <data name="DefaultError" xml:space="preserve">
     <value>An unknown failure has occurred.</value>
     <comment>Default identity result error message</comment>
   </data>
-    <data name="DuplicateEmail" xml:space="preserve">
+  <data name="DuplicateEmail" xml:space="preserve">
     <value>Email '{0}' is already taken.</value>
     <comment>Error for duplicate emails</comment>
   </data>
-    <data name="DuplicateRoleName" xml:space="preserve">
+  <data name="DuplicateRoleName" xml:space="preserve">
     <value>Role name '{0}' is already taken.</value>
     <comment>Error for duplicate roles</comment>
   </data>
-    <data name="DuplicateUserName" xml:space="preserve">
+  <data name="DuplicateUserName" xml:space="preserve">
     <value>Username '{0}' is already taken.</value>
     <comment>Error for duplicate user names</comment>
   </data>
-    <data name="InvalidEmail" xml:space="preserve">
+  <data name="InvalidEmail" xml:space="preserve">
     <value>Email '{0}' is invalid.</value>
     <comment>Invalid email</comment>
   </data>
-    <data name="InvalidManagerType" xml:space="preserve">
-    <value>Type {0} must derive from {1}&lt;{2}&gt;.</value>
-    <comment>Error when the manager type is not derived correctly</comment>
-  </data>
-    <data name="InvalidPasswordHasherCompatibilityMode" xml:space="preserve">
-    <value>The provided PasswordHasherCompatibilityMode is invalid.</value>
-    <comment>Error when the password hasher doesn't understand the format it's being asked to produce.</comment>
-  </data>
-    <data name="InvalidPasswordHasherIterationCount" xml:space="preserve">
-    <value>The iteration count must be a positive integer.</value>
-    <comment>Error when the iteration count is &lt; 1.</comment>
-  </data>
-    <data name="InvalidRoleName" xml:space="preserve">
+  <data name="InvalidRoleName" xml:space="preserve">
     <value>Role name '{0}' is invalid.</value>
     <comment>Error for invalid role names</comment>
   </data>
-    <data name="InvalidToken" xml:space="preserve">
+  <data name="InvalidToken" xml:space="preserve">
     <value>Invalid token.</value>
     <comment>Error when a token is not recognized</comment>
   </data>
-    <data name="InvalidUserName" xml:space="preserve">
+  <data name="InvalidUserName" xml:space="preserve">
     <value>Username '{0}' is invalid, can only contain letters or digits.</value>
     <comment>User names can only contain letters or digits</comment>
   </data>
-    <data name="LoginAlreadyAssociated" xml:space="preserve">
+  <data name="LoginAlreadyAssociated" xml:space="preserve">
     <value>A user with this login already exists.</value>
     <comment>Error when a login already linked</comment>
   </data>
-    <data name="MustCallAddIdentity" xml:space="preserve">
-    <value>AddIdentity must be called on the service collection.</value>
-    <comment>Error when AddIdentity is not called</comment>
-  </data>
-    <data name="NoTokenProvider" xml:space="preserve">
-    <value>No IUserTwoFactorTokenProvider&lt;{0}&gt; named '{1}' is registered.</value>
-    <comment>Error when there is no IUserTwoFactorTokenProvider</comment>
-  </data>
-    <data name="NullSecurityStamp" xml:space="preserve">
-    <value>User security stamp cannot be null.</value>
-    <comment>Error when a user's security stamp is null.</comment>
-  </data>
-    <data name="PasswordMismatch" xml:space="preserve">
+  <data name="PasswordMismatch" xml:space="preserve">
     <value>Incorrect password.</value>
     <comment>Error when a password doesn't match</comment>
   </data>
-    <data name="PasswordRequiresDigit" xml:space="preserve">
+  <data name="PasswordRequiresDigit" xml:space="preserve">
     <value>Passwords must have at least one digit ('0'-'9').</value>
     <comment>Error when passwords do not have a digit</comment>
   </data>
-    <data name="PasswordRequiresLower" xml:space="preserve">
+  <data name="PasswordRequiresLower" xml:space="preserve">
     <value>Passwords must have at least one lowercase ('a'-'z').</value>
     <comment>Error when passwords do not have a lowercase letter</comment>
   </data>
-    <data name="PasswordRequiresNonAlphanumeric" xml:space="preserve">
+  <data name="PasswordRequiresNonAlphanumeric" xml:space="preserve">
     <value>Passwords must have at least one non alphanumeric character.</value>
     <comment>Error when password does not have enough non alphanumeric characters</comment>
   </data>
-    <data name="PasswordRequiresUpper" xml:space="preserve">
+  <data name="PasswordRequiresUpper" xml:space="preserve">
     <value>Passwords must have at least one uppercase ('A'-'Z').</value>
     <comment>Error when passwords do not have an uppercase letter</comment>
   </data>
-    <data name="PasswordTooShort" xml:space="preserve">
+  <data name="PasswordTooShort" xml:space="preserve">
     <value>Passwords must be at least {0} characters.</value>
     <comment>Error message for passwords that are too short</comment>
   </data>
-    <data name="RoleNotFound" xml:space="preserve">
-    <value>Role {0} does not exist.</value>
-    <comment>Error when a role does not exist</comment>
-  </data>
-    <data name="StoreNotIQueryableRoleStore" xml:space="preserve">
-    <value>Store does not implement IQueryableRoleStore&lt;TRole&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIQueryableUserStore" xml:space="preserve">
-    <value>Store does not implement IQueryableUserStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIRoleClaimStore" xml:space="preserve">
-    <value>Store does not implement IRoleClaimStore&lt;TRole&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserAuthenticationTokenStore" xml:space="preserve">
-    <value>Store does not implement IUserAuthenticationTokenStore&lt;User&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserClaimStore" xml:space="preserve">
-    <value>Store does not implement IUserClaimStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserConfirmationStore" xml:space="preserve">
-    <value>Store does not implement IUserConfirmationStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserEmailStore" xml:space="preserve">
-    <value>Store does not implement IUserEmailStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserLockoutStore" xml:space="preserve">
-    <value>Store does not implement IUserLockoutStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserLoginStore" xml:space="preserve">
-    <value>Store does not implement IUserLoginStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserPasswordStore" xml:space="preserve">
-    <value>Store does not implement IUserPasswordStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserPhoneNumberStore" xml:space="preserve">
-    <value>Store does not implement IUserPhoneNumberStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserRoleStore" xml:space="preserve">
-    <value>Store does not implement IUserRoleStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserSecurityStampStore" xml:space="preserve">
-    <value>Store does not implement IUserSecurityStampStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserAuthenticatorKeyStore" xml:space="preserve">
-    <value>Store does not implement IUserAuthenticatorKeyStore&lt;User&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserTwoFactorStore" xml:space="preserve">
-    <value>Store does not implement IUserTwoFactorStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="RecoveryCodeRedemptionFailed" xml:space="preserve">
+  <data name="RecoveryCodeRedemptionFailed" xml:space="preserve">
     <value>Recovery code redemption failed.</value>
     <comment>Error when a recovery code is not redeemed.</comment>
   </data>
-    <data name="UserAlreadyHasPassword" xml:space="preserve">
+  <data name="UserAlreadyHasPassword" xml:space="preserve">
     <value>User already has a password set.</value>
     <comment>Error when AddPasswordAsync called when a user already has a password</comment>
   </data>
-    <data name="UserAlreadyInRole" xml:space="preserve">
+  <data name="UserAlreadyInRole" xml:space="preserve">
     <value>User already in role '{0}'.</value>
     <comment>Error when a user is already in a role</comment>
   </data>
-    <data name="UserLockedOut" xml:space="preserve">
-    <value>User is locked out.</value>
-    <comment>Error when a user is locked out</comment>
-  </data>
-    <data name="UserLockoutNotEnabled" xml:space="preserve">
+  <data name="UserLockoutNotEnabled" xml:space="preserve">
     <value>Lockout is not enabled for this user.</value>
     <comment>Error when lockout is not enabled</comment>
   </data>
-    <data name="UserNameNotFound" xml:space="preserve">
-    <value>User {0} does not exist.</value>
-    <comment>Error when a user does not exist</comment>
-  </data>
-    <data name="UserNotInRole" xml:space="preserve">
+  <data name="UserNotInRole" xml:space="preserve">
     <value>User is not in role '{0}'.</value>
     <comment>Error when a user is not in the role</comment>
   </data>
-    <data name="StoreNotIUserTwoFactorRecoveryCodeStore" xml:space="preserve">
-    <value>Store does not implement IUserTwoFactorRecoveryCodeStore&lt;User&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="PasswordRequiresUniqueChars" xml:space="preserve">
+  <data name="PasswordRequiresUniqueChars" xml:space="preserve">
     <value>Passwords must use at least {0} different characters.</value>
     <comment>Error message for passwords that are based on similar characters</comment>
   </data>
-    <data name="NoRoleType" xml:space="preserve">
-    <value>No RoleType was specified, try AddRoles&lt;TRole&gt;().</value>
-    <comment>Error when the IdentityBuilder.RoleType was not specified</comment>
-  </data>
-    <data name="StoreNotIProtectedUserStore" xml:space="preserve">
-    <value>Store does not implement IProtectedUserStore&lt;TUser&gt; which is required when ProtectPersonalData = true.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="NoPersonalDataProtector" xml:space="preserve">
-    <value>No IPersonalDataProtector service was registered, this is required when ProtectPersonalData = true.</value>
-    <comment>Error when there is no IPersonalDataProtector</comment>
-  </data>
 </root>
\ No newline at end of file
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Services/Contracts/IAuthTokenProvider.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Services/Contracts/IAuthTokenProvider.cs
index c25ec72a06..a91808cb6c 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Services/Contracts/IAuthTokenProvider.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Shared/Services/Contracts/IAuthTokenProvider.cs
@@ -2,5 +2,6 @@
 
 public interface IAuthTokenProvider
 {
+    bool IsInitialized { get; }
     Task<string?> GetAccessTokenAsync();
 }
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/Directory.Build.props b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/Directory.Build.props
index a0b3569542..0bdd57c020 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/Directory.Build.props
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/Directory.Build.props
@@ -1,12 +1,12 @@
 <!-- Generated by bit-web template v-8.1.0-pre-02 -->
 <Project>
     <!--/-:msbuild-conditional:noEmit -->
-    <PropertyGroup>	
-        <Nullable>enable</Nullable>
+    <PropertyGroup>
+        <LangVersion>12.0</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <Nullable>enable</Nullable>
         <NoWarn>$(NoWarn);CS1998;CS1591</NoWarn>
-        <LangVersion>12.0</LangVersion>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NeutralLanguage>en</NeutralLanguage>
         <MultilingualEnabled>true</MultilingualEnabled>
         <DefineConstants Condition="'$(MultilingualEnabled)' == 'true'">$(DefineConstants);MultilingualEnabled</DefineConstants>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml
index d108da98fb..72d7ee4756 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml
@@ -8,7 +8,7 @@ variables:
   APP_SERVICE_NAME: 'app-service-bp-test'
   AZURE_SUBSCRIPTION: 'bp-test-service-connection' # https://learn.microsoft.com/en-us/azure/devops/pipelines/library/service-endpoints?view=azure-devops&tabs=yaml#azure-resource-manager-service-connection
   ConnectionStrings.SqlServerConnectionString: $(DB_CONNECTION_STRING)
-  AppSettings.JwtSettings.IdentityCertificatePassword: $(API_IDENTITY_CERTIFICATE_PASSWORD)
+  AppSettings.IdentitySettings.IdentityCertificatePassword: $(API_IDENTITY_CERTIFICATE_PASSWORD)
   ApiServerAddress: 'https://bp.bitplatform.dev/api/'
 
 jobs:
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml
index 5652a4f4e0..4258463cd5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml
@@ -97,7 +97,7 @@ jobs:
           files: 'appsettings.json'
         env:
           ConnectionStrings.SqlServerConnectionString: ${{ secrets.DB_CONNECTION_STRING }}
-          AppSettings.JwtSettings.IdentityCertificatePassword: ${{ secrets.API_IDENTITY_CERTIFICATE_PASSWORD }}
+          AppSettings.IdentitySettings.IdentityCertificatePassword: ${{ secrets.API_IDENTITY_CERTIFICATE_PASSWORD }}
 
       - name: Delete IdentityCertificate.pfx
         run: |
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/Boilerplate.slnLaunch b/src/Templates/Boilerplate/Bit.Boilerplate/Boilerplate.slnLaunch
new file mode 100644
index 0000000000..cb685c8971
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/Boilerplate.slnLaunch
@@ -0,0 +1,57 @@
+[
+  {
+    "Name": "Api \u002B Blazor Hybrid",
+    "Projects": [
+      {
+        "Name": "src\\Server\\Api\\Boilerplate.Server.Api.csproj",
+        "Action": "Start",
+        "DebugTarget": "Boilerplate.Server.Api-Swagger"
+      },
+      {
+        "Name": "src\\Client\\App\\Boilerplate.Client.App.csproj",
+        "Action": "Start",
+        "DebugTarget": "Windows Machine"
+      }
+    ]
+  },
+  {
+    "Name": "Api \u002B Blazor Server",
+    "Projects": [
+      {
+        "Name": "src\\Server\\Api\\Boilerplate.Server.Api.csproj",
+        "Action": "Start",
+        "DebugTarget": "Boilerplate.Server.Api-Swagger"
+      },
+      {
+        "Name": "src\\Client\\Web\\Boilerplate.Client.Web.csproj",
+        "Action": "Start",
+        "DebugTarget": "Boilerplate.Client.Web"
+      }
+    ]
+  },
+  {
+    "Name": "Api \u002B Blazor Wasm",
+    "Projects": [
+      {
+        "Name": "src\\Server\\Api\\Boilerplate.Server.Api.csproj",
+        "Action": "Start",
+        "DebugTarget": "Boilerplate.Server.Api-BlazorWebAssembly"
+      }
+    ]
+  },
+  {
+    "Name": "Api \u002B Blazor Electron",
+    "Projects": [
+      {
+        "Name": "src\\Server\\Api\\Boilerplate.Server.Api.csproj",
+        "Action": "Start",
+        "DebugTarget": "Boilerplate.Server.Api-Swagger"
+      },
+      {
+        "Name": "src\\Client\\Web\\Boilerplate.Client.Web.csproj",
+        "Action": "Start",
+        "DebugTarget": "Boilerplate.Client.Web.Electron"
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Boilerplate.Client.App.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Boilerplate.Client.App.csproj
index ac1dac9f2d..5c809c6059 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Boilerplate.Client.App.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Boilerplate.Client.App.csproj
@@ -26,7 +26,6 @@
         <UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>
 
         <NoWarn>$(NoWarn);ClassWithoutModifierAnalyzer</NoWarn>
-        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <PropertyGroup Condition="$(TargetFramework.Contains('-android')) and '$(Configuration)' == 'Release'">
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Extensions/IServiceCollectionExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Extensions/IServiceCollectionExtensions.cs
index f87f6fdda2..7b4e15c5f9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Extensions/IServiceCollectionExtensions.cs
@@ -20,9 +20,9 @@ public static IServiceCollection AddClientAppServices(this IServiceCollection se
         services.AddClientWindowsServices();
 #endif
 
-        services.AddScoped<MainPage>();
+        services.AddTransient<MainPage>();
         services.AddSingleton<IBitDeviceCoordinator, AppDeviceCoordinator>();
-        services.AddScoped<IExceptionHandler, AppExceptionHandler>();
+        services.AddTransient<IExceptionHandler, AppExceptionHandler>();
 
         return services;
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/MauiProgram.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/MauiProgram.cs
index 3eeb182265..c99cc31c1c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/MauiProgram.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/MauiProgram.cs
@@ -30,9 +30,9 @@ public static MauiApp CreateMauiApp()
 
         Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.Absolute, out var apiServerAddress);
 
-        services.AddScoped(sp =>
+        services.AddTransient(sp =>
         {
-            var handler = sp.GetRequiredService<LocalizationDelegatingHandler>();
+            var handler = sp.GetRequiredService<RequestHeadersDelegationHandler>();
             HttpClient httpClient = new(handler)
             {
                 BaseAddress = apiServerAddress
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/App.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/App.razor.cs
index b1c10c5706..34e21d9161 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/App.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/App.razor.cs
@@ -12,7 +12,7 @@ public partial class App
 #endif
 
     [AutoInject] private IJSRuntime _jsRuntime = default!;
-    [AutoInject] private IBitDeviceCoordinator _bitDeviceCoordinator { get; set; } = default!;
+    [AutoInject] private IBitDeviceCoordinator _bitDeviceCoordinator = default!;
 
 #if BlazorHybrid && MultilingualEnabled
     private bool _cultureHasNotBeenSet = true;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Boilerplate.Client.Core.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Boilerplate.Client.Core.csproj
index 9773253d40..bdffaa4bae 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Boilerplate.Client.Core.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Boilerplate.Client.Core.csproj
@@ -3,8 +3,6 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <UseMauiEssentials Condition=" '$(BlazorMode)' == 'BlazorHybrid' ">true</UseMauiEssentials>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
         <ResolveStaticWebAssetsInputsDependsOn>
             BeforeBuildTasks;
             $(ResolveStaticWebAssetsInputsDependsOn)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IListExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/ICollectionExtensions.cs
similarity index 59%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IListExtensions.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/ICollectionExtensions.cs
index 8f50eb4679..399d6b295f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IListExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/ICollectionExtensions.cs
@@ -1,6 +1,6 @@
 namespace System.Collections.Generic;
 
-public static class IListExtensions
+public static class ICollectionExtensions
 {
     // Basically a Polyfill since we now expose IList instead of List
     // which is better but IList doesn't have AddRange
@@ -20,4 +20,14 @@ public static void AddRange<T>(this IList<T> list, IEnumerable<T> items)
             list.Add(item);
         }
     }
+
+    public static async Task<List<T>> ToListAsync<T>(this IAsyncEnumerable<T> items, CancellationToken cancellationToken = default)
+    {
+        var results = new List<T>();
+        await foreach (var item in items.WithCancellation(cancellationToken))
+        {
+            results.Add(item);
+        }
+        return results;
+    }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IJSRuntimeExtensions.Hybrid.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IJSRuntimeExtensions.Hybrid.cs
new file mode 100644
index 0000000000..f8c5b6298b
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IJSRuntimeExtensions.Hybrid.cs
@@ -0,0 +1,60 @@
+using Boilerplate.Shared.Dtos.Identity;
+
+namespace Microsoft.JSInterop;
+
+// In Blazor Hybrid, we employ Preferences along with an in-memory dictionary to emulate the functionality of cookies, localStorage, and sessionStorage.
+public static class IJSRuntimeHybridExtensions
+{
+#if BlazorHybrid
+    private static readonly Dictionary<string, string?> _sessionStorage = [];
+
+    public static async Task SetCookie(this IJSRuntime jsRuntime, string key, string value, long expiresIn, bool rememberMe)
+    {
+        if (rememberMe)
+        {
+            Preferences.Set(key, value);
+        }
+        else
+        {
+            _sessionStorage[key] = value;
+        }
+    }
+
+    public static async Task RemoveCookie(this IJSRuntime jsRuntime, string key)
+    {
+        _sessionStorage.Remove(key);
+        Preferences.Remove(key);
+    }
+
+    public static async Task<string?> GetCookie(this IJSRuntime jsRuntime, string key)
+    {
+        return _sessionStorage.TryGetValue(key, out string? value) ? value : Preferences.Get(key, null);
+    }
+
+    public static async Task SetLocalStorage(this IJSRuntime jsRuntime, string key, string value, bool rememberMe)
+    {
+        await jsRuntime.SetCookie(key, value, default, rememberMe);
+    }
+
+    public static async Task RemoveLocalStorage(this IJSRuntime jsRuntime, string key)
+    {
+        await jsRuntime.RemoveCookie(key);
+    }
+
+    public static async Task<string?> GetLocalStorage(this IJSRuntime jsRuntime, string key)
+    {
+        return await jsRuntime.GetCookie(key);
+    }
+
+    public static async Task StoreAuthToken(this IJSRuntime jsRuntime, TokenResponseDto tokenResponse, bool? rememberMe = null)
+    {
+        if (rememberMe is null)
+        {
+            rememberMe = Preferences.Get("refresh_token", null) is null;
+        }
+
+        await jsRuntime.SetCookie("access_token", tokenResponse.AccessToken!, tokenResponse.ExpiresIn, rememberMe is true);
+        await jsRuntime.SetLocalStorage("refresh_token", tokenResponse.RefreshToken!, rememberMe is true);
+    }
+#endif
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IJSRuntimeExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IJSRuntimeExtensions.cs
new file mode 100644
index 0000000000..aee01f7e02
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IJSRuntimeExtensions.cs
@@ -0,0 +1,76 @@
+using Boilerplate.Shared.Dtos.Identity;
+
+namespace Microsoft.JSInterop;
+
+public static class IJSRuntimeExtensions
+{
+    /// <summary>
+    /// To disable the scrollbar of the body when showing the modal, so the modal can be always shown in the viewport without being scrolled out.
+    /// </summary>
+    public static async Task SetBodyOverflow(this IJSRuntime jsRuntime, bool hidden)
+    {
+        await jsRuntime.InvokeVoidAsync("App.setBodyOverflow", hidden);
+    }
+
+    public static async Task GoBack(this IJSRuntime jsRuntime)
+    {
+        await jsRuntime.InvokeVoidAsync("App.goBack");
+    }
+
+    public static async Task ApplyBodyElementClasses(this IJSRuntime jsRuntime, List<string> cssClasses, Dictionary<string, string> cssVariables)
+    {
+        await jsRuntime.InvokeVoidAsync("App.applyBodyElementClasses", cssClasses, cssVariables);
+    }
+
+    public static async Task RemoveAuthTokens(this IJSRuntime jsRuntime)
+    {
+        await jsRuntime.RemoveCookie("access_token");
+        await jsRuntime.RemoveLocalStorage("refresh_token");
+    }
+
+#if !BlazorHybrid
+
+    public static async Task SetCookie(this IJSRuntime jsRuntime, string key, string value, long expiresIn, bool rememberMe)
+    {
+        await jsRuntime.InvokeVoidAsync("App.setCookie", key, value, expiresIn, rememberMe);
+    }
+
+    public static async Task RemoveCookie(this IJSRuntime jsRuntime, string key)
+    {
+        await jsRuntime.InvokeVoidAsync("App.removeCookie", key);
+    }
+
+    public static async Task<string?> GetCookie(this IJSRuntime jsRuntime, string key)
+    {
+        return await jsRuntime.InvokeAsync<string?>("App.getCookie", key);
+    }
+
+    public static async Task SetLocalStorage(this IJSRuntime jsRuntime, string key, string value, bool rememberMe)
+    {
+        await jsRuntime.InvokeVoidAsync($"window.{(rememberMe ? "localStorage" : "sessionStorage")}.setItem", key, value);
+    }
+
+    public static async Task RemoveLocalStorage(this IJSRuntime jsRuntime, string key)
+    {
+        await jsRuntime.InvokeVoidAsync("window.sessionStorage.removeItem", key);
+        await jsRuntime.InvokeVoidAsync("window.localStorage.removeItem", key);
+    }
+
+    public static async Task<string?> GetLocalStorage(this IJSRuntime jsRuntime, string key)
+    {
+        return (await jsRuntime.InvokeAsync<string?>("window.localStorage.getItem", key)) ??
+            (await jsRuntime.InvokeAsync<string?>("window.sessionStorage.getItem", key));
+    }
+
+    public static async Task StoreAuthToken(this IJSRuntime jsRuntime, TokenResponseDto tokenResponse, bool? rememberMe = null)
+    {
+        if (rememberMe is null)
+        {
+            rememberMe = string.IsNullOrEmpty(await jsRuntime.InvokeAsync<string?>("window.localStorage.getItem", "refresh_token")) is false;
+        }
+
+        await jsRuntime.SetCookie("access_token", tokenResponse.AccessToken!, tokenResponse.ExpiresIn, rememberMe is true);
+        await jsRuntime.SetLocalStorage("refresh_token", tokenResponse.RefreshToken!, rememberMe is true);
+    }
+#endif
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IServiceCollectionExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IServiceCollectionExtensions.cs
index 6440cd658c..22fb0f8b2d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/IServiceCollectionExtensions.cs
@@ -10,23 +10,55 @@ public static IServiceCollection AddClientSharedServices(this IServiceCollection
     {
         // Services registered in this class can be injected in client side (Web, Android, iOS, Windows, macOS and Linux)
 
-        services.AddCascadingAuthenticationState();
-        services.AddScoped<IPrerenderStateService, PrerenderStateService>();
-        services.AddScoped<IPubSubService, PubSubService>();
+        services.AddTransient<IPrerenderStateService, PrerenderStateService>();
+        services.AddSessioned<IPubSubService, PubSubService>();
         services.AddBitBlazorUIServices();
 
-        services.AddTransient<LocalizationDelegatingHandler>();
+        services.AddTransient<RequestHeadersDelegationHandler>();
         services.AddTransient<AuthDelegatingHandler>();
         services.AddTransient<RetryDelegatingHandler>();
         services.AddTransient<ExceptionDelegatingHandler>();
         services.AddTransient<HttpClientHandler>();
 
-        services.AddScoped<AuthenticationStateProvider, AppAuthenticationStateProvider>();
-        services.AddScoped<IAuthenticationService, AuthenticationService>();
-        services.AddScoped(sp => (AppAuthenticationStateProvider)sp.GetRequiredService<AuthenticationStateProvider>());
+        services.AddSessioned<AuthenticationStateProvider, AppAuthenticationStateProvider>();
+        services.AddSessioned(sp => (AppAuthenticationStateProvider)sp.GetRequiredService<AuthenticationStateProvider>());
 
-        services.AddScoped<MessageBoxService>();
+        services.AddTransient<MessageBoxService>();
 
         return services;
     }
+
+    /// <summary>
+    /// Utilizing the AddSessioned method seamlessly configures the service to function as a singleton in BlazorHybrid, BlazorWebAssembly,
+    /// and BlazorElectron environments. Simultaneously, it employs per-scope registration for pre-rendering and BlazorServer scenarios
+    /// </summary>
+    public static IServiceCollection AddSessioned<TService, TImplementation>(this IServiceCollection services)
+        where TImplementation : class, TService
+        where TService : class
+    {
+        if (BlazorModeDetector.Current.IsBlazorElectron() || BlazorModeDetector.Current.IsBlazorHybrid() || OperatingSystem.IsBrowser())
+        {
+            return services.AddSingleton<TService, TImplementation>();
+        }
+        else
+        {
+            return services.AddScoped<TService, TImplementation>();
+        }
+    }
+
+    /// <summary>
+    /// <inheritdoc cref="AddSessioned{TService, TImplementation}(IServiceCollection)"/>
+    /// </summary>
+    public static IServiceCollection AddSessioned<TService>(this IServiceCollection services, Func<IServiceProvider, TService> implementationFactory)
+        where TService : class
+    {
+        if (BlazorModeDetector.Current.IsBlazorElectron() || BlazorModeDetector.Current.IsBlazorHybrid() || OperatingSystem.IsBrowser())
+        {
+            return services.AddSingleton(implementationFactory);
+        }
+        else
+        {
+            return services.AddScoped(implementationFactory);
+        }
+    }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/JsRuntimeExtension.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/JsRuntimeExtension.cs
deleted file mode 100644
index a279c37811..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Extensions/JsRuntimeExtension.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Microsoft.JSInterop;
-
-public static class JSRuntimeExtension
-{
-    /// <summary>
-    /// To disable the scrollbar of the body when showing the modal, so the modal can be always shown in the viewport without being scrolled out.
-    /// </summary>
-    public static async Task SetBodyOverflow(this IJSRuntime jsRuntime, bool hidden)
-    {
-        await jsRuntime.InvokeVoidAsync("App.setBodyOverflow", hidden);
-    }
-
-    public static async Task GoBack(this IJSRuntime jsRuntime)
-    {
-        await jsRuntime.InvokeVoidAsync("App.goBack");
-    }
-
-    public static async Task ApplyBodyElementClasses(this IJSRuntime jsRuntime, List<string> cssClasses, Dictionary<string, string> cssVariables)
-    {
-        await jsRuntime.InvokeVoidAsync("App.applyBodyElementClasses", cssClasses, cssVariables);
-    }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor
index 7f950be30a..741e223d42 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/AddOrEditCategoryPage.razor
@@ -54,8 +54,8 @@
 
         <div class="form-input-container">
             <BitLabel For="catColorInput">@Localizer[nameof(AppStrings.Color)]</BitLabel>
-                <div class="color-container">
-                    @foreach (var color in new[] { "#FFCD56", "#FF6384", "#4BC0C0", "#FF9124", "#2B88D8", "#C7E0F4" })
+            <div class="color-container">
+                @foreach (var color in new[] { "#FFCD56", "#FF6384", "#4BC0C0", "#FF9124", "#2B88D8", "#C7E0F4" })
                 {
                     <button @onclick="() => SetCategoryColor(color)"
                             class="color-btn @(_category.Color == color ? "color-btn--active" : null)"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/CategoriesPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/CategoriesPage.razor.cs
index ba8a9b678e..76be2962fe 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/CategoriesPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/CategoriesPage.razor.cs
@@ -60,7 +60,7 @@ private void PrepareGridDataProvider()
 
                 var data = await HttpClient.GetFromJsonAsync(url, AppJsonContext.Default.PagedResultCategoryDto) ?? new();
 
-                return BitDataGridItemsProviderResult.From(data.Items!, (int)data.TotalCount);
+                return BitDataGridItemsProviderResult.From(await data.Items!.ToListAsync()!, (int)data.TotalCount);
             }
             catch (Exception exp)
             {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.cs
index 37ee3ec93e..101628c526 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/DeleteAccountConfirmModal.razor.cs
@@ -2,8 +2,7 @@
 
 public partial class DeleteAccountConfirmModal
 {
-    [Parameter]
-    public bool IsOpen { get; set; }
+    [Parameter] public bool IsOpen { get; set; }
 
     [Parameter] public EventCallback<bool> IsOpenChanged { get; set; }
 
@@ -18,7 +17,9 @@ private async Task DeleteAccount()
     {
         await HttpClient.DeleteAsync("User/Delete");
 
-        await AuthenticationService.SignOut();
+        await JSRuntime.RemoveAuthTokens();
+
+        await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
 
         await CloseModal();
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EditProfilePage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EditProfilePage.razor
index 47e58e3d58..e934cf2a2c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EditProfilePage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EditProfilePage.razor
@@ -3,9 +3,9 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.EditProfileTitle)]</PageTitle>
 
-    <div class="page-container">
-        <div class="content-container profile-panel">
-            @if (string.IsNullOrEmpty(_editProfileMessage) is false)
+<div class="page-container">
+    <div class="content-container profile-panel">
+        @if (string.IsNullOrEmpty(_editProfileMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_editProfileMessageType"
@@ -45,16 +45,16 @@
                 }
 
                 <BitLabel>@Localizer[nameof(AppStrings.ProfileImage)]</BitLabel>
-                    <BitFileUpload @onfocus="() => _profileImageError = null"
-                                   Label="@Localizer[nameof(AppStrings.UploadNewProfileImage)]"
-                                   Accept="image/*"
-                                   AutoUploadEnabled="true"
-                                   UploadUrl="@_profileImageUploadUrl"
-                                   OnUploadComplete="WrapHandled(RefreshProfileData)"
-                                   OnUploadFailed="() => _profileImageError = Localizer[nameof(AppStrings.FileUploadFailed)]"
-                                   MaxSize="1024 * 1024 * 10"
-                                   ChunkedUploadEnabled="false" />
-                    <div class="form-input-error">@_profileImageError</div>
+                <BitFileUpload @onfocus="() => _profileImageError = null"
+                               Label="@Localizer[nameof(AppStrings.UploadNewProfileImage)]"
+                               Accept="image/*"
+                               AutoUploadEnabled="true"
+                               UploadUrl="@_profileImageUploadUrl"
+                               OnUploadComplete="WrapHandled(RefreshProfileData)"
+                               OnUploadFailed="() => _profileImageError = Localizer[nameof(AppStrings.FileUploadFailed)]"
+                               MaxSize="1024 * 1024 * 10"
+                               ChunkedUploadEnabled="false" />
+                <div class="form-input-error">@_profileImageError</div>
             </div>
 
             <EditForm Model="_userToEdit" OnValidSubmit="WrapHandled(DoSave)" class="edit-profile-form">
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EditProfilePage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EditProfilePage.razor.cs
index 4e3587c50e..ae43014caa 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EditProfilePage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EditProfilePage.razor.cs
@@ -43,16 +43,14 @@ protected override async Task OnInitAsync()
 
     private async Task LoadEditProfileData()
     {
-        _user = await PrerenderStateService.GetValue($"{nameof(EditProfilePage)}-{nameof(_user)}", GetCurrentUser) ?? new();
+        _user = await GetCurrentUser() ?? new();
 
         UpdateEditProfileData();
     }
 
     private async Task RefreshProfileData()
     {
-        _user = await GetCurrentUser() ?? new();
-
-        UpdateEditProfileData();
+        await LoadEditProfileData();
 
         PubSubService.Publish(PubSubMessages.PROFILE_UPDATED, _user);
     }
@@ -64,8 +62,7 @@ private void UpdateEditProfileData()
         _userToEdit.BirthDate = _user.BirthDate;
     }
 
-    private Task<UserDto?> GetCurrentUser() => HttpClient.GetFromJsonAsync("User/GetCurrentUser", AppJsonContext.Default.UserDto);
-
+    private Task<UserDto?> GetCurrentUser() => PrerenderStateService.GetValue($"{nameof(EditProfilePage)}-{nameof(_user)}", () => HttpClient.GetFromJsonAsync("User/GetCurrentUser", AppJsonContext.Default.UserDto));
 
     private async Task DoSave()
     {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor
index fee2629740..3931621843 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor
@@ -3,14 +3,14 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.EmailConfirmationTitle)]</PageTitle>
 
-    <div class="page-container">
-        <div class="form">
-            @if (string.IsNullOrEmpty(_emailConfirmationMessage) is false)
+<div class="page-container">
+    <div class="form">
+        @if (string.IsNullOrEmpty(_resendLinkErrors ?? Errors) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_emailConfirmationMessageType"
-                           OnDismiss="() => _emailConfirmationMessage = null">
-                @_emailConfirmationMessage
+                           OnDismiss="() => _resendLinkErrors = Errors = null">
+                @(_resendLinkErrors ?? Errors)
             </BitMessageBar>
         }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor.cs
index 920e9f2665..10c8a1f794 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/EmailConfirmationPage.razor.cs
@@ -3,16 +3,17 @@
 public partial class EmailConfirmationPage
 {
     private bool _isLoading;
-    private string? _emailConfirmationMessage;
-    private BitMessageBarType _emailConfirmationMessageType;
+    private string? _resendLinkErrors;
+    private BitMessageBarType _emailConfirmationMessageType = BitMessageBarType.Error;
 
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public string? Email { get; set; }
+    [SupplyParameterFromQuery, Parameter] public string? Email { get; set; }
 
-    [Parameter]
-    [SupplyParameterFromQuery(Name = "email-confirmed")]
-    public bool EmailConfirmed { get; set; }
+    /// <summary>
+    /// Email confirmation errors populated by api/Identity/ConfirmEmail endpoint.
+    /// </summary>
+    [SupplyParameterFromQuery, Parameter] public string? Errors { get; set; }
+
+    [SupplyParameterFromQuery(Name = "email-confirmed"), Parameter] public bool EmailConfirmed { get; set; }
 
     private void RedirectToSignIn()
     {
@@ -24,21 +25,21 @@ private async Task DoResendLink()
         if (_isLoading) return;
 
         _isLoading = true;
-        _emailConfirmationMessage = null;
+        _resendLinkErrors = Errors = null;
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/SendConfirmationEmail", new() { Email = Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/SendConfirmationEmail", new() { Email = Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto);
 
             _emailConfirmationMessageType = BitMessageBarType.Success;
 
-            _emailConfirmationMessage = Localizer[nameof(AppStrings.ResendConfirmationLinkMessage)];
+            _resendLinkErrors = Localizer[nameof(AppStrings.ResendConfirmationLinkMessage)];
         }
         catch (KnownException e)
         {
             _emailConfirmationMessageType = BitMessageBarType.Error;
 
-            _emailConfirmationMessage = e.Message;
+            _resendLinkErrors = e.Message;
         }
         finally
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor
index 26b5abfc12..5a1b065278 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor
@@ -3,11 +3,11 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.ForgetPasswordTitle)]</PageTitle>
 
-    <div class="page-container">
-        <EditForm Model="_forgotPasswordModel" OnValidSubmit="WrapHandled(DoSubmit)" class="form">
-            <AppDataAnnotationsValidator />
+<div class="page-container">
+    <EditForm Model="_forgotPasswordModel" OnValidSubmit="WrapHandled(DoSubmit)" class="form">
+        <AppDataAnnotationsValidator />
 
-            @if (string.IsNullOrEmpty(_forgotPasswordMessage) is false)
+        @if (string.IsNullOrEmpty(_forgotPasswordMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_forgotPasswordMessageType"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor.cs
index 16f5a34584..abc53be4e3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ForgotPasswordPage.razor.cs
@@ -18,7 +18,7 @@ private async Task DoSubmit()
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/SendResetPasswordEmail", _forgotPasswordModel, AppJsonContext.Default.SendResetPasswordEmailRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/SendResetPasswordEmail", _forgotPasswordModel, AppJsonContext.Default.SendResetPasswordEmailRequestDto);
 
             _forgotPasswordMessageType = BitMessageBarType.Success;
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ResetPasswordPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ResetPasswordPage.razor
index 90a6200435..08c75ab43a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ResetPasswordPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ResetPasswordPage.razor
@@ -3,11 +3,11 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.ResetPasswordTitle)]</PageTitle>
 
-    <div class="page-container">
-        <EditForm Model="_resetPasswordModel" OnValidSubmit="WrapHandled(DoSubmit)" class="form">
-            <AppDataAnnotationsValidator />
+<div class="page-container">
+    <EditForm Model="_resetPasswordModel" OnValidSubmit="WrapHandled(DoSubmit)" class="form">
+        <AppDataAnnotationsValidator />
 
-            @if (string.IsNullOrEmpty(_resetPasswordMessage) is false)
+        @if (string.IsNullOrEmpty(_resetPasswordMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_resetPasswordMessageType"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ResetPasswordPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ResetPasswordPage.razor.cs
index 35abfe664e..b17b12d890 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ResetPasswordPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/ResetPasswordPage.razor.cs
@@ -9,13 +9,9 @@ public partial class ResetPasswordPage
     private BitMessageBarType _resetPasswordMessageType;
     private ResetPasswordRequestDto _resetPasswordModel = new();
 
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public string? Email { get; set; }
+    [Parameter][SupplyParameterFromQuery] public string? Email { get; set; }
 
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public string? Token { get; set; }
+    [Parameter][SupplyParameterFromQuery] public string? Token { get; set; }
 
     protected override async Task OnInitAsync()
     {
@@ -29,7 +25,7 @@ protected override async Task OnAfterFirstRenderAsync()
     {
         await base.OnAfterFirstRenderAsync();
 
-        if (await AuthenticationStateProvider.IsUserAuthenticatedAsync())
+        if ((await AuthenticationStateTask).User.IsAuthenticated())
         {
             NavigationManager.NavigateTo("/");
         }
@@ -44,19 +40,11 @@ private async Task DoSubmit()
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/ResetPassword", _resetPasswordModel, AppJsonContext.Default.ResetPasswordRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/ResetPassword", _resetPasswordModel, AppJsonContext.Default.ResetPasswordRequestDto);
 
             _resetPasswordMessageType = BitMessageBarType.Success;
 
             _resetPasswordMessage = Localizer[nameof(AppStrings.PasswordChangedSuccessfullyMessage)];
-
-            await AuthenticationService.SignIn(new SignInRequestDto
-            {
-                UserName = Email,
-                Password = _resetPasswordModel.Password
-            });
-
-            NavigationManager.NavigateTo("/");
         }
         catch (KnownException e)
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignInPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignInPage.razor
index e2390cda67..d61e1e9cbe 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignInPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignInPage.razor
@@ -3,11 +3,11 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.SignInTitle)]</PageTitle>
 
-    <div class="page-container">
-        <EditForm OnValidSubmit="WrapHandled(DoSignIn)" class="form" Model="_signInModel">
-            <AppDataAnnotationsValidator />
+<div class="page-container">
+    <EditForm OnValidSubmit="WrapHandled(DoSignIn)" class="form" Model="_signInModel">
+        <AppDataAnnotationsValidator />
 
-            @if (string.IsNullOrEmpty(_signInMessage) is false)
+        @if (string.IsNullOrEmpty(_signInMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_signInMessageType"
@@ -36,6 +36,10 @@
             <ValidationMessage For="@(() => _signInModel.Password)" />
         </div>
 
+        <div class="form-input-container form-input-container--no-margin">
+            <BitCheckbox Class="form-checkbox" @bind-Value="_signInModel.RememberMe" Label="@Localizer[nameof(AppStrings.RememberMe)]" />
+        </div>
+
         <BitButton IsLoading="_isLoading"
                    Class="form-submit-button"
                    ButtonStyle="BitButtonStyle.Primary"
@@ -47,10 +51,10 @@
 
         <div class="form-forgot-password">
             <BitLink Href="/forgot-password">@Localizer[nameof(AppStrings.ForgotPasswordLink)]</BitLink>
-            </div>
+        </div>
 
-            <div>
-                @Localizer[nameof(AppStrings.DontHaveAccountMessage)] <BitLink Href="/sign-up">@Localizer[nameof(AppStrings.SignUp)]</BitLink>
-            </div>
-        </EditForm>
-    </div>
+        <div>
+            @Localizer[nameof(AppStrings.DontHaveAccountMessage)] <BitLink Href="/sign-up">@Localizer[nameof(AppStrings.SignUp)]</BitLink>
+        </div>
+    </EditForm>
+</div>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignInPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignInPage.razor.cs
index fca7543151..4c8afc7db9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignInPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignInPage.razor.cs
@@ -9,15 +9,13 @@ public partial class SignInPage
     private BitMessageBarType _signInMessageType;
     private SignInRequestDto _signInModel = new();
 
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public string? RedirectUrl { get; set; }
+    [SupplyParameterFromQuery(Name = "redirect-url"), Parameter] public string? RedirectUrl { get; set; }
 
     protected override async Task OnAfterFirstRenderAsync()
     {
         await base.OnAfterFirstRenderAsync();
 
-        if (await AuthenticationStateProvider.IsUserAuthenticatedAsync())
+        if ((await AuthenticationStateTask).User.IsAuthenticated())
         {
             NavigationManager.NavigateTo("/");
         }
@@ -32,7 +30,12 @@ private async Task DoSignIn()
 
         try
         {
-            await AuthenticationService.SignIn(_signInModel);
+            var result = await (await HttpClient.PostAsJsonAsync("Identity/SignIn", _signInModel, AppJsonContext.Default.SignInRequestDto))
+                .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto);
+
+            await JSRuntime.StoreAuthToken(result!, _signInModel.RememberMe);
+
+            await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
 
             NavigationManager.NavigateTo(RedirectUrl ?? "/");
         }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignUpPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignUpPage.razor
index f6383c7aef..2d6c040c74 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignUpPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignUpPage.razor
@@ -3,11 +3,11 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.SingUpTitle)]</PageTitle>
 
-    <div class="page-container">
-        <EditForm Model="_signUpModel" OnValidSubmit="WrapHandled(DoSignUp)" class="form">
-            <AppDataAnnotationsValidator />
+<div class="page-container">
+    <EditForm Model="_signUpModel" OnValidSubmit="WrapHandled(DoSignUp)" class="form">
+        <AppDataAnnotationsValidator />
 
-            @if (string.IsNullOrEmpty(_signUpMessage) is false)
+        @if (string.IsNullOrEmpty(_signUpMessage) is false)
         {
             <BitMessageBar Class="form-message-bar"
                            MessageBarType="@_signUpMessageType"
@@ -46,7 +46,7 @@
             <br />
             <div>
                 <BitLink Href="/sign-in">@Localizer[nameof(AppStrings.SignIn)]</BitLink>
-                </div>
+            </div>
         }
         else
         {
@@ -76,10 +76,10 @@
                 <BitCheckbox Class="form-checkbox" @bind-Value="_signUpModel.TermsAccepted">
                     <LabelTemplate>
                         <span>@Localizer[nameof(AppStrings.TermsMessage)]&nbsp<BitLink Href="/terms">@Localizer[nameof(AppStrings.TermsTitle)]</BitLink></span>
-                        </LabelTemplate>
-                    </BitCheckbox>
-                    <ValidationMessage For="@(() => _signUpModel.TermsAccepted)" />
-                </div>
+                    </LabelTemplate>
+                </BitCheckbox>
+                <ValidationMessage For="@(() => _signUpModel.TermsAccepted)" />
+            </div>
 
             <BitButton IsLoading="_isLoading"
                        Class="form-submit-button"
@@ -92,7 +92,7 @@
 
             <div>
                 @Localizer[nameof(AppStrings.AlreadyHaveAccountMessage)] <BitLink Href="/sign-in">@Localizer[nameof(AppStrings.SignIn)]</BitLink>
-                </div>
+            </div>
         }
 
     </EditForm>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignUpPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignUpPage.razor.cs
index 6c6ae2003b..7412a544db 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignUpPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Identity/SignUpPage.razor.cs
@@ -15,7 +15,7 @@ protected override async Task OnAfterFirstRenderAsync()
     {
         await base.OnAfterFirstRenderAsync();
 
-        if (await AuthenticationStateProvider.IsUserAuthenticatedAsync())
+        if ((await AuthenticationStateTask).User.IsAuthenticated())
         {
             NavigationManager.NavigateTo("/");
         }
@@ -30,7 +30,7 @@ private async Task DoSignUp()
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/SignUp", _signUpModel, AppJsonContext.Default.SignUpRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/SignUp", _signUpModel, AppJsonContext.Default.SignUpRequestDto);
 
             _isSignedUp = true;
         }
@@ -59,7 +59,7 @@ private async Task DoResendLink()
 
         try
         {
-            await HttpClient.PostAsJsonAsync("Auth/SendConfirmationEmail", new() { Email = _signUpModel.Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto);
+            await HttpClient.PostAsJsonAsync("Identity/SendConfirmationEmail", new() { Email = _signUpModel.Email }, AppJsonContext.Default.SendConfirmationEmailRequestDto);
 
             _signUpMessageType = BitMessageBarType.Success;
             _signUpMessage = Localizer[nameof(AppStrings.ResendConfirmationLinkMessage)];
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor
index e807f28468..2178b3c46c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor
@@ -16,7 +16,7 @@
         <h1 class="page-title">@Localizer[nameof(AppStrings.Products)]</h1>
         <BitButton OnClick="WrapHandled(CreateProduct)">@Localizer[nameof(AppStrings.AddProduct)]</BitButton>
     </div>
-    
+
     <div class="grid">
         <BitDataGrid @ref="_dataGrid" ItemsProvider="_productsProvider" TGridItem="ProductDto" ResizableColumns="true" Pagination="_pagination">
             <BitDataGridPropertyColumn Title="@Localizer[nameof(AppStrings.Id)]" Property="p => p!.Id" Sortable="true" Class="id-col"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor.cs
index bf02046678..ba04c4aaf8 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor.cs
@@ -61,7 +61,7 @@ private void PrepareGridDataProvider()
 
                 var data = await HttpClient.GetFromJsonAsync(url, AppJsonContext.Default.PagedResultProductDto);
 
-                return BitDataGridItemsProviderResult.From(data!.Items!, (int)data!.TotalCount);
+                return BitDataGridItemsProviderResult.From(await data!.Items!.ToListAsync(), (int)data!.TotalCount);
             }
             catch (Exception exp)
             {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/TermsPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/TermsPage.razor
index 66dae592db..6e6435c175 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/TermsPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/TermsPage.razor
@@ -7,18 +7,18 @@
     <div class="page-content">
 
         <section class="main-section">
-                <h1 class="main-section-title">Boilerplate license</h1>
+            <h1 class="main-section-title">Boilerplate license</h1>
             <div class="section-desc">
-                    This EULA and Privacy Policy are written for individuals who use the Boilerplate Demo Version through the <BitLink Href="https://todo.bitplatform.dev" Target="_blank">todo.bitplatform.dev</BitLink> website, or the published version of this app on the bit platform's Google Play, Apple Store, and Microsoft Store accounts.
+                This EULA and Privacy Policy are written for individuals who use the Boilerplate Demo Version through the <BitLink Href="https://todo.bitplatform.dev" Target="_blank">todo.bitplatform.dev</BitLink> website, or the published version of this app on the bit platform's Google Play, Apple Store, and Microsoft Store accounts.
                 <br />
                 If you want to build your own project based on this Project Template, please refer to the <BitLink Href="https://github.com/bitfoundation/bitplatform/blob/develop/LICENSE" Target="_blank">License</BitLink> and create your own project, publish it with the relevant EULA and Privacy Policy for your business.s
             </div>
         </section>
 
         <section class="sub-section">
-                <h2 class="sub-section-title">End-User License Agreement (EULA) for Boilerplate Demo Version</h2>
+            <h2 class="sub-section-title">End-User License Agreement (EULA) for Boilerplate Demo Version</h2>
             <div class="section-desc">
-                    This End-User License Agreement (EULA) is a legal agreement between you (the "user") and bit platform, located at Sixmastraat 15, 8932 PA Leeuwarden, Netherlands, with phone number <BitLink Href="tel:+31684207362">+31684207362</BitLink>, for the use of Boilerplate Demo Version (the "Software").
+                This End-User License Agreement (EULA) is a legal agreement between you (the "user") and bit platform, located at Sixmastraat 15, 8932 PA Leeuwarden, Netherlands, with phone number <BitLink Href="tel:+31684207362">+31684207362</BitLink>, for the use of Boilerplate Demo Version (the "Software").
                 <br />
                 By using the Software, you agree to be bound by the terms and conditions of this agreement.
             </div>
@@ -27,7 +27,7 @@
         <section class="sub-section">
             <h2 class="sub-section-title">License Grant</h2>
             <div class="section-desc">
-                    bit platform hereby grants the user a non-exclusive, non-transferable license to use the Software, solely for the purpose of evaluating and testing the features of the Boilerplate Demo Version during the term of this EULA.
+                bit platform hereby grants the user a non-exclusive, non-transferable license to use the Software, solely for the purpose of evaluating and testing the features of the Boilerplate Demo Version during the term of this EULA.
             </div>
         </section>
 
@@ -41,7 +41,7 @@
         <section class="sub-section">
             <h2 class="sub-section-title">User Data</h2>
             <div class="section-desc">
-                    bit platform may collect user data, including name, surname, photo, date of birth, and gender. Providing this information is optional, and bit platform will only use it for the purposes of the Boilerplate Demo Version. If the user requests, bit platform will delete this data within one day, using one of the contact methods provided at the end of this EULA. In addition, the user is required to provide an email address for account verification purposes, but bit platform will not use this email for any other purposes.
+                bit platform may collect user data, including name, surname, photo, date of birth, and gender. Providing this information is optional, and bit platform will only use it for the purposes of the Boilerplate Demo Version. If the user requests, bit platform will delete this data within one day, using one of the contact methods provided at the end of this EULA. In addition, the user is required to provide an email address for account verification purposes, but bit platform will not use this email for any other purposes.
             </div>
         </section>
 
@@ -93,10 +93,10 @@
             <div class="section-desc">
                 <ul>
                     <li>bit platform is committed to protecting the privacy of the user data.</li>
-                        <li>We will only use the data collected from the user for the purposes of the Boilerplate Demo Version and will delete this data upon user request, using one of the contact methods provided above.</li>
+                    <li>We will only use the data collected from the user for the purposes of the Boilerplate Demo Version and will delete this data upon user request, using one of the contact methods provided above.</li>
                     <li>We do not share the user data with any third parties and do not allow users to share data with anyone in any way.</li>
-                        <li>We do not collect any information on user's usage in the Boilerplate Demo Version.</li>
-                        <li>We do not display any Third-Party content, advertisements, or any purchases in the Boilerplate Demo Version.</li>
+                    <li>We do not collect any information on user's usage in the Boilerplate Demo Version.</li>
+                    <li>We do not display any Third-Party content, advertisements, or any purchases in the Boilerplate Demo Version.</li>
                     <li>This Privacy Policy is effective until 2025-12-31 and is subject to change without notice.</li>
                 </ul>
             </div>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Todo/TodoPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Todo/TodoPage.razor
index c0ba7d1ec9..d29e7c62e4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Todo/TodoPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Todo/TodoPage.razor
@@ -3,16 +3,16 @@
 
 <PageTitle>@Localizer[nameof(AppStrings.TodoTitle)]</PageTitle>
 
-    <div class="page-container">
-        <div class="search-box-container">
-            <BitSearchBox Style="width: 300px"
-                          OnChange="SearchTodoItems"
-                          OnClear="@(() => SearchTodoItems(""))"
-                          Placeholder="@Localizer[nameof(AppStrings.TodoSearchPlaceholder)]" />
-        </div>
+<div class="page-container">
+    <div class="search-box-container">
+        <BitSearchBox Style="width: 300px"
+                      OnChange="SearchTodoItems"
+                      OnClear="@(() => SearchTodoItems(""))"
+                      Placeholder="@Localizer[nameof(AppStrings.TodoSearchPlaceholder)]" />
+    </div>
 
-        <div class="todo-content">
-            <h1 class="main-title">@Localizer[nameof(AppStrings.TodoTitle)]</h1>
+    <div class="todo-content">
+        <h1 class="main-title">@Localizer[nameof(AppStrings.TodoTitle)]</h1>
         <div class="add-todo-container">
             <BitTextField @bind-Value="_newTodoTitle"
                           Placeholder="@Localizer[nameof(AppStrings.TodoAddPlaceholder)]"
@@ -61,7 +61,7 @@
                         <div class="todo-list--empty-state">
                             <img src="/_content/Boilerplate.Client.Core/images/backgrounds/empty-todo-list-bg.svg">
                             <BitLabel>@Localizer[nameof(AppStrings.NoTodos)]</BitLabel>
-                            </div>
+                        </div>
                     }
                     else
                     {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Scripts/app.ts b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Scripts/app.ts
index 3009cd6273..bcf2925db0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Scripts/app.ts
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Scripts/app.ts
@@ -1,8 +1,12 @@
 class App {
-    public static setCookie(name: string, value: string, seconds: number) {
+    public static setCookie(name: string, value: string, seconds: number, remeber: boolean) {
         const date = new Date();
         date.setSeconds(date.getSeconds() + seconds);
-        document.cookie = `${name}=${value};expires=${date.toUTCString()};path=/;samesite=strict;`;
+        let cookie = `${name}=${value};path=/;samesite=strict;`;
+        if (remeber == true) {
+            cookie = cookie += `expires=${date.toUTCString()};`;
+        }
+        document.cookie = cookie;
     }
 
     public static getCookie(name: string): string | null {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/AppAuthenticationStateProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/AppAuthenticationStateProvider.cs
index 46c1cbcb0f..63cd2633d9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/AppAuthenticationStateProvider.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/AppAuthenticationStateProvider.cs
@@ -6,6 +6,8 @@ namespace Boilerplate.Client.Core.Services;
 public partial class AppAuthenticationStateProvider : AuthenticationStateProvider
 {
     [AutoInject] private IAuthTokenProvider _tokenProvider = default!;
+    [AutoInject] private HttpClient _httpClient = default;
+    [AutoInject] private IJSRuntime _jsRuntime = default!;
 
     public async Task RaiseAuthenticationStateHasChanged()
     {
@@ -16,18 +18,31 @@ public override async Task<AuthenticationState> GetAuthenticationStateAsync()
     {
         var access_token = await _tokenProvider.GetAccessTokenAsync();
 
-        if (string.IsNullOrWhiteSpace(access_token)) return NotSignedIn();
+        if (string.IsNullOrEmpty(access_token) && _tokenProvider.IsInitialized)
+        {
+            string? refresh_token = await _jsRuntime.GetLocalStorage("refresh_token");
+
+            if (string.IsNullOrEmpty(refresh_token) is false)
+            {
+                var refreshTokenResponse = await (await _httpClient.PostAsJsonAsync("Identity/Refresh", new() { RefreshToken = refresh_token }, AppJsonContext.Default.RefreshRequestDto))
+                    .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto);
+
+                await _jsRuntime.StoreAuthToken(refreshTokenResponse!);
+
+                access_token = refreshTokenResponse!.AccessToken;
+            }
+        }
+
+        if (string.IsNullOrEmpty(access_token))
+        {
+            return NotSignedIn();
+        }
 
         var identity = new ClaimsIdentity(claims: ParseTokenClaims(access_token), authenticationType: "Bearer", nameType: "name", roleType: "role");
 
         return new AuthenticationState(new ClaimsPrincipal(identity));
     }
 
-    public async Task<bool> IsUserAuthenticatedAsync()
-    {
-        return (await GetAuthenticationStateAsync()).User.Identity?.IsAuthenticated == true;
-    }
-
     private static AuthenticationState NotSignedIn()
     {
         return new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity()));
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/AuthenticationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/AuthenticationService.cs
deleted file mode 100644
index a4c0cfcdd8..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/AuthenticationService.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//-:cnd:noEmit
-using Boilerplate.Shared.Dtos.Identity;
-
-namespace Boilerplate.Client.Core.Services;
-
-public partial class AuthenticationService : IAuthenticationService
-{
-    [AutoInject] private HttpClient _httpClient = default!;
-
-    [AutoInject] private IJSRuntime _jsRuntime = default!;
-
-    [AutoInject] private AppAuthenticationStateProvider _authenticationStateProvider = default!;
-
-    public async Task SignIn(SignInRequestDto dto)
-    {
-        var result = await (await _httpClient.PostAsJsonAsync("Auth/SignIn", dto, AppJsonContext.Default.SignInRequestDto))
-            .Content.ReadFromJsonAsync(AppJsonContext.Default.SignInResponseDto);
-
-#if BlazorHybrid
-        Preferences.Set("access_token", result!.AccessToken);
-#else
-        await _jsRuntime.InvokeVoidAsync("App.setCookie", "access_token", result!.AccessToken, result.ExpiresIn);
-#endif
-
-        await _authenticationStateProvider.RaiseAuthenticationStateHasChanged();
-    }
-
-    public async Task SignOut()
-    {
-#if BlazorHybrid
-        Preferences.Remove("access_token");
-#else
-        await _jsRuntime.InvokeVoidAsync("App.removeCookie", "access_token");
-#endif
-
-        await _authenticationStateProvider.RaiseAuthenticationStateHasChanged();
-    }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/ClientSideAuthTokenProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/ClientSideAuthTokenProvider.cs
index 5567f0ca9a..266cac0a34 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/ClientSideAuthTokenProvider.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/ClientSideAuthTokenProvider.cs
@@ -5,12 +5,10 @@ public partial class ClientSideAuthTokenProvider : IAuthTokenProvider
 {
     [AutoInject] private IJSRuntime _jsRuntime = default!;
 
+    public bool IsInitialized => true;
+
     public async Task<string?> GetAccessTokenAsync()
     {
-#if BlazorHybrid
-        return Preferences.Get("access_token", null);
-#else
-        return await _jsRuntime.InvokeAsync<string>("App.getCookie", "access_token");
-#endif
+        return await _jsRuntime.GetCookie("access_token");
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/Contracts/IAuthenticationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/Contracts/IAuthenticationService.cs
deleted file mode 100644
index 0a27ec5358..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/Contracts/IAuthenticationService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Boilerplate.Shared.Dtos.Identity;
-
-namespace Boilerplate.Client.Core.Services.Contracts;
-
-public interface IAuthenticationService
-{
-    Task SignIn(SignInRequestDto dto);
-
-    Task SignOut();
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/Contracts/IPubSubService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/Contracts/IPubSubService.cs
index 4e962858b6..74e9aebace 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/Contracts/IPubSubService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/Contracts/IPubSubService.cs
@@ -6,5 +6,5 @@
 public interface IPubSubService
 {
     void Publish(string message, object? payload);
-    Action Subscribe(string message, Action<object?> handler);
+    Action Subscribe(string message, Func<object?, Task> handler);
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/ExceptionHandlerBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/ExceptionHandlerBase.cs
index fbb4084ca0..bc8391efce 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/ExceptionHandlerBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/ExceptionHandlerBase.cs
@@ -6,46 +6,22 @@ namespace Boilerplate.Client.Core.Services;
 public abstract partial class ExceptionHandlerBase : IExceptionHandler
 {
     [AutoInject] protected readonly IStringLocalizer<AppStrings> Localizer = default!;
-    [AutoInject] protected readonly IAuthenticationService AuthenticationService = default!;
     [AutoInject] protected readonly MessageBoxService MessageBoxService = default!;
 
     public virtual void Handle(Exception exception, IDictionary<string, object?>? parameters = null)
     {
-        if (exception is UnauthorizedException)
-        {
-            SignOut();
+        string exceptionMessage = (exception as KnownException)?.Message ??
+#if DEBUG
+            exception.ToString();
+#else
+            _localizer[nameof(AppStrings.UnknownException)];
+#endif
 
-            return;
-        }
+        _ = MessageBoxService.Show(exceptionMessage, Localizer[nameof(AppStrings.Error)]);
 
 #if DEBUG
-        string exceptionMessage = (exception as KnownException)?.Message ?? exception.ToString();
-        _ = MessageBoxService.Show(exceptionMessage, Localizer[nameof(AppStrings.Error)]);
         _ = Console.Out.WriteLineAsync(exceptionMessage);
         Debugger.Break();
-#else
-        if (exception is KnownException knownException)
-        {
-            _ = MessageBoxService.Show(knownException.Message, Localizer[nameof(AppStrings.Error)]);
-        }
-        else
-        {
-            _ = MessageBoxService.Show(Localizer[nameof(AppStrings.UnknownException)], Localizer[nameof(AppStrings.Error)]);
-        }
 #endif
     }
-
-    private async void SignOut()
-    {
-        try
-        {
-            await MessageBoxService.Show(Localizer[nameof(AppStrings.YouNeedToSignIn)], Localizer[nameof(AppStrings.Error)]);
-
-            await AuthenticationService.SignOut();
-        }
-        catch (Exception exp)
-        {
-            Handle(exp);
-        }
-    }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
index 6fe70a4ed3..ab56051da1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
@@ -1,35 +1,23 @@
 using System.Net.Http.Headers;
+using Boilerplate.Shared.Dtos.Identity;
 
 namespace Boilerplate.Client.Core.Services.HttpMessageHandlers;
 
-public class AuthDelegatingHandler
-    : DelegatingHandler
+public class AuthDelegatingHandler(IAuthTokenProvider tokenProvider, IServiceProvider serviceProvider, IJSRuntime jsRuntime, RetryDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    private IAuthTokenProvider _tokenProvider = default!;
-    private IJSRuntime _jsRuntime = default!;
-
-    public AuthDelegatingHandler(IAuthTokenProvider tokenProvider, IJSRuntime jsRuntime, RetryDelegatingHandler handler)
-        : base(handler)
-    {
-        _tokenProvider = tokenProvider;
-        _jsRuntime = jsRuntime;
-    }
-
-    public AuthDelegatingHandler(IAuthTokenProvider tokenProvider, IJSRuntime jsRuntime)
-        : base()
-    {
-        _tokenProvider = tokenProvider;
-        _jsRuntime = jsRuntime;
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         if (request.Headers.Authorization is null)
         {
-            var access_token = await _tokenProvider.GetAccessTokenAsync();
-            if (access_token is not null)
+            if (OperatingSystem.IsBrowser() is false)
             {
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token);
+                // Browsers automatically send cookies, yet we still require access_token for pre-rendering purposes.
+                var access_token = await tokenProvider.GetAccessTokenAsync();
+                if (access_token is not null)
+                {
+                    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token);
+                }
             }
         }
 
@@ -37,10 +25,41 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
         {
             return await base.SendAsync(request, cancellationToken);
         }
-        catch (UnauthorizedException)
+        catch (Exception _) when ((_ is ForbiddenException or UnauthorizedException) && tokenProvider.IsInitialized)
         {
-            // try to get refresh token, store access token and refresh token,
-            // then use the new access token to request's authorization header and call base.SendAsync again.
+            // Notes about ForbiddenException:
+            // Let's update the access token by refreshing it when a refresh token is available.
+            // Following this procedure, the newly acquired access token may now include the necessary roles or claims.
+
+            var refresh_token = await jsRuntime.GetLocalStorage("refresh_token");
+
+            if (refresh_token is not null)
+            {
+                var httpClient = serviceProvider.GetRequiredService<HttpClient>();
+                var appAuthStateProvider = serviceProvider.GetRequiredService<AppAuthenticationStateProvider>();
+
+                try
+                {
+                    var refreshTokenResponse = await (await httpClient.PostAsJsonAsync("Identity/Refresh", new RefreshRequestDto { RefreshToken = refresh_token }, AppJsonContext.Default.RefreshRequestDto, cancellationToken))
+                        .Content.ReadFromJsonAsync(AppJsonContext.Default.TokenResponseDto, cancellationToken);
+
+                    await jsRuntime.StoreAuthToken(refreshTokenResponse!);
+
+                    request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", refreshTokenResponse!.AccessToken);
+                }
+                catch (ResourceValidationException exp) /* refresh_token is expired */
+                {
+                    await jsRuntime.RemoveAuthTokens();
+                    throw new UnauthorizedException(nameof(AppStrings.YouNeedToSignIn), exp);
+                }
+                finally
+                {
+                    await appAuthStateProvider.RaiseAuthenticationStateHasChanged();
+                }
+
+                return await base.SendAsync(request, cancellationToken);
+            }
+
             throw;
         }
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
index 4088ea3434..556951bbef 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
@@ -2,20 +2,9 @@
 
 namespace Boilerplate.Client.Core.Services.HttpMessageHandlers;
 
-public class ExceptionDelegatingHandler
-    : DelegatingHandler
+public class ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
+    : DelegatingHandler(httpClientHandler)
 {
-    public ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
-        : base(httpClientHandler)
-    {
-
-    }
-
-    public ExceptionDelegatingHandler()
-    {
-
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         bool serverCommunicationSuccess = false;
@@ -26,11 +15,6 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
             serverCommunicationSuccess = true;
 
-            if (response.StatusCode is HttpStatusCode.Unauthorized)
-            {
-                throw new UnauthorizedException();
-            }
-
             if (response.IsSuccessStatusCode is false && response.Content.Headers.ContentType?.MediaType?.Contains("application/json", StringComparison.InvariantCultureIgnoreCase) is true)
             {
                 if (response.Headers.TryGetValues("Request-ID", out IEnumerable<string>? values) && values is not null && values.Any())
@@ -52,6 +36,15 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 }
             }
 
+            if (response.StatusCode is HttpStatusCode.Unauthorized)
+            {
+                throw new UnauthorizedException(AppStrings.YouNeedToSignIn);
+            }
+            if (response.StatusCode is HttpStatusCode.Forbidden)
+            {
+                throw new ForbiddenException(AppStrings.ForbiddenException);
+            }
+
             response.EnsureSuccessStatusCode();
 
             return response;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/LocalizationDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
similarity index 61%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/LocalizationDelegatingHandler.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
index f0879e3521..503a073fda 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/LocalizationDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
@@ -1,23 +1,19 @@
 using System.Net.Http.Headers;
+#if BlazorWebAssembly
+using Microsoft.AspNetCore.Components.WebAssembly.Http;
+#endif
 
 namespace Boilerplate.Client.Core.Services.HttpMessageHandlers;
 
-public class LocalizationDelegatingHandler
-    : DelegatingHandler
+public class RequestHeadersDelegationHandler(AuthDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    public LocalizationDelegatingHandler(AuthDelegatingHandler handler) 
-        : base(handler)
-    {
-
-    }
-
-    public LocalizationDelegatingHandler()
-    {
-
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
+#if BlazorWebAssembly
+        request.SetBrowserResponseStreamingEnabled(true);
+#endif
+
 #if MultilingualEnabled
         request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(CultureInfo.CurrentCulture.Name));
 #endif
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
index 025466b17d..77bc244ee5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
@@ -1,18 +1,8 @@
 namespace Boilerplate.Client.Core.Services.HttpMessageHandlers;
 
-public class RetryDelegatingHandler
-    : DelegatingHandler
+public class RetryDelegatingHandler(ExceptionDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    public RetryDelegatingHandler(ExceptionDelegatingHandler handler)
-        : base(handler)
-    {
-
-    }
-
-    public RetryDelegatingHandler()
-    {
-
-    }
 
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/PrerenderStateService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/PrerenderStateService.cs
index ebedde74cb..c15a250f48 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/PrerenderStateService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/PrerenderStateService.cs
@@ -15,11 +15,7 @@ public class PrerenderStateService : IPrerenderStateService, IAsyncDisposable
     public PrerenderStateService(PersistentComponentState applicationState)
     {
         _applicationState = applicationState;
-
-        if (OperatingSystem.IsBrowser() is false)
-        {
-            _subscription = applicationState.RegisterOnPersisting(PersistAsJson);
-        }
+        _subscription = applicationState.RegisterOnPersisting(PersistAsJson);
     }
 
     public async Task<T?> GetValue<T>(string key, Func<Task<T?>> factory)
@@ -33,16 +29,12 @@ public PrerenderStateService(PersistentComponentState applicationState)
 
     void Persist<T>(string key, T value)
     {
-        if (OperatingSystem.IsBrowser()) return;
-
         _values.TryRemove(key, out object? _);
         _values.TryAdd(key, value);
     }
 
     async Task PersistAsJson()
     {
-        if (OperatingSystem.IsBrowser()) return;
-
         foreach (var item in _values)
         {
             _applicationState.PersistAsJson(item.Key, item.Value);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/PubSubService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/PubSubService.cs
index b0ff463240..fab4af82e1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/PubSubService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Services/PubSubService.cs
@@ -3,19 +3,25 @@
 /// <summary>
 /// For more information <see cref="IPubSubService"/> docs.
 /// </summary>
-public class PubSubService : IPubSubService
+public partial class PubSubService : IPubSubService
 {
-    private readonly ConcurrentDictionary<string, List<Action<object?>>> _handlers = new();
+    [AutoInject] private IServiceProvider _serviceProvider = default!;
+
+    private readonly ConcurrentDictionary<string, List<Func<object?, Task>>> _handlers = new();
 
     public void Publish(string message, object? payload)
     {
         if (_handlers.TryGetValue(message, out var handlers))
         {
-            handlers.ForEach(handler => handler(payload));
+            foreach (var handler in handlers)
+            {
+                handler(payload)
+                    .ContinueWith(t => _serviceProvider.GetRequiredService<IExceptionHandler>().Handle(t.Exception!), TaskContinuationOptions.OnlyOnFaulted);
+            }
         }
     }
 
-    public Action Subscribe(string message, Action<object?> handler)
+    public Action Subscribe(string message, Func<object?, Task> handler)
     {
         var handlers = _handlers.ContainsKey(message)
                             ? _handlers[message]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/AppComponentBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/AppComponentBase.cs
index 2d65b5c24f..d0c4ce06a2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/AppComponentBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/AppComponentBase.cs
@@ -24,12 +24,12 @@ public partial class AppComponentBase : ComponentBase
 
     [AutoInject] protected IStringLocalizer<AppStrings> Localizer = default!;
 
-    [AutoInject] protected IAuthenticationService AuthenticationService = default!;
-
     [AutoInject] protected IExceptionHandler ExceptionHandler { get; set; } = default!;
 
     [AutoInject] protected AppAuthenticationStateProvider AuthenticationStateProvider = default!;
 
+    [CascadingParameter] public Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
     protected sealed override async Task OnInitializedAsync()
     {
         try
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/AppDataAnnotationsValidator.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/AppDataAnnotationsValidator.cs
index 6fa4323d43..763bc77c90 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/AppDataAnnotationsValidator.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/AppDataAnnotationsValidator.cs
@@ -21,17 +21,17 @@ public partial class AppDataAnnotationsValidator : AppComponentBase, IDisposable
     [AutoInject] private IServiceProvider _serviceProvider = default!;
     [AutoInject] private IStringLocalizerFactory _stringLocalizerFactory = default!;
 
-    [CascadingParameter] private EditContext _editContext { get; set; } = default!;
+    [CascadingParameter] public EditContext EditContext { get; set; } = default!;
 
     protected override Task OnInitAsync()
     {
-        if (_editContext is null)
+        if (EditContext is null)
             throw new InvalidOperationException("EditContext is required");
 
-        _editContext.OnFieldChanged += OnFieldChanged;
-        _editContext.OnValidationRequested += OnValidationRequested;
+        EditContext.OnFieldChanged += OnFieldChanged;
+        EditContext.OnValidationRequested += OnValidationRequested;
 
-        _validationMessageStore = new ValidationMessageStore(_editContext);
+        _validationMessageStore = new ValidationMessageStore(EditContext);
 
         return base.OnInitAsync();
     }
@@ -98,12 +98,12 @@ private void OnFieldChanged(object? sender, FieldChangedEventArgs eventArgs)
             _validationMessageStore.Add(fieldIdentifier, result.ErrorMessage!);
         }
 
-        _editContext.NotifyValidationStateChanged();
+        EditContext.NotifyValidationStateChanged();
     }
 
     private void OnValidationRequested(object? sender, ValidationRequestedEventArgs e)
     {
-        var validationContext = new ValidationContext(_editContext.Model, _serviceProvider, items: null);
+        var validationContext = new ValidationContext(EditContext.Model, _serviceProvider, items: null);
         var results = new List<ValidationResult>();
 
         var objectType = validationContext.ObjectType;
@@ -156,7 +156,7 @@ private void OnValidationRequested(object? sender, ValidationRequestedEventArgs
         }
         else
         {
-            Validator.TryValidateObject(_editContext.Model, validationContext, results, true);
+            Validator.TryValidateObject(EditContext.Model, validationContext, results, true);
         }
 
         _validationMessageStore.Clear();
@@ -168,15 +168,15 @@ private void OnValidationRequested(object? sender, ValidationRequestedEventArgs
             foreach (var memberName in validationResult.MemberNames)
             {
                 hasMemberNames = true;
-                _validationMessageStore.Add(_editContext.Field(memberName), validationResult.ErrorMessage!);
+                _validationMessageStore.Add(EditContext.Field(memberName), validationResult.ErrorMessage!);
             }
 
             if (hasMemberNames) continue;
 
-            _validationMessageStore.Add(new FieldIdentifier(_editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!);
+            _validationMessageStore.Add(new FieldIdentifier(EditContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!);
         }
 
-        _editContext.NotifyValidationStateChanged();
+        EditContext.NotifyValidationStateChanged();
     }
 
     public void Dispose()
@@ -189,10 +189,10 @@ protected virtual void Dispose(bool disposing)
     {
         if (_disposed || disposing is false) return;
 
-        if (_editContext is not null)
+        if (EditContext is not null)
         {
-            _editContext.OnFieldChanged -= OnFieldChanged;
-            _editContext.OnValidationRequested -= OnValidationRequested;
+            EditContext.OnFieldChanged -= OnFieldChanged;
+            EditContext.OnValidationRequested -= OnValidationRequested;
         }
 
         _disposed = true;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/ChangePrerenderResponseStatusCode.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/ChangePrerenderResponseStatusCode.cs
index 2ba55c805d..493a6e1910 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/ChangePrerenderResponseStatusCode.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/ChangePrerenderResponseStatusCode.cs
@@ -7,13 +7,11 @@ namespace Boilerplate.Client.Core.Shared;
 /// </summary>
 public partial class ChangePrerenderResponseStatusCode : AppComponentBase
 {
-    [Parameter]
-    public HttpStatusCode StatusCode { get; set; }
+    [Parameter] public HttpStatusCode StatusCode { get; set; }
 
     private static readonly Type? _httpContextAccessorType = Type.GetType("Microsoft.AspNetCore.Http.IHttpContextAccessor, Microsoft.AspNetCore.Http.Abstractions");
 
-    [AutoInject]
-    public IServiceProvider _serviceProvider = default!;
+    [AutoInject] public IServiceProvider _serviceProvider = default!;
 
     protected override Task OnInitAsync()
     {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Footer.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Footer.razor.cs
index 14f5756a2a..abc7fd7be0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Footer.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Footer.razor.cs
@@ -3,7 +3,7 @@ namespace Boilerplate.Client.Core.Shared;
 
 public partial class Footer
 {
-    [AutoInject] private BitThemeManager _bitThemeManager { get; set; } = default!;
+    [AutoInject] private BitThemeManager _bitThemeManager = default!;
     [AutoInject] private IBitDeviceCoordinator _bitDeviceCoordinator { get; set; } = default!;
 
     private BitDropdownItem<string>[] _cultures = default!;
@@ -23,7 +23,7 @@ protected override async Task OnAfterFirstRenderAsync()
 #if BlazorHybrid
         var preferredCultureCookie = Preferences.Get(".AspNetCore.Culture", null);
 #else
-        var preferredCultureCookie = await JSRuntime.InvokeAsync<string?>("window.App.getCookie", ".AspNetCore.Culture");
+        var preferredCultureCookie = await JSRuntime.GetCookie(".AspNetCore.Culture");
 #endif
         SelectedCulture = CultureInfoManager.GetCurrentCulture(preferredCultureCookie);
 
@@ -42,7 +42,7 @@ private async Task OnCultureChanged()
 #if BlazorHybrid
         Preferences.Set(".AspNetCore.Culture", cultureCookie);
 #else
-        await JSRuntime.InvokeVoidAsync("window.App.setCookie", ".AspNetCore.Culture", cultureCookie, 30 * 24 * 3600);
+        await JSRuntime.SetCookie(".AspNetCore.Culture", cultureCookie, 30 * 24 * 3600, rememberMe: true);
 #endif
 
         NavigationManager.Refresh(forceReload: true);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Header.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Header.razor
index 8e3c764b0d..be41ba3eb1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Header.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Header.razor
@@ -11,7 +11,7 @@
     <div class="header-contact">
         @if (!_isUserAuthenticated)
         {
-            <BitActionButton Class="header-item" IconName="@BitIconName.EntityExtraction" Href="/terms" Target="_self">@Localizer[nameof(AppStrings.Term)]</BitActionButton>
+            <BitActionButton Class="header-item" IconName="@BitIconName.EntityExtraction" Href="/terms" Target="_self">@Localizer[nameof(AppStrings.TermsTitle)]</BitActionButton>
             <BitActionButton Class="header-item" IconName="@BitIconName.AddFriend" Href="/sign-up" Target="_self">@Localizer[nameof(AppStrings.SignUp)]</BitActionButton>
             <BitActionButton Class="header-item" IconName="@BitIconName.Signin" Href="/sign-in" Target="_self">@Localizer[nameof(AppStrings.SignIn)]</BitActionButton>
         }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Header.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Header.razor.cs
index 3b0fa1a1d8..96b0b6fc97 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Header.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/Header.razor.cs
@@ -11,7 +11,7 @@ protected override async Task OnInitAsync()
     {
         AuthenticationStateProvider.AuthenticationStateChanged += VerifyUserIsAuthenticatedOrNot;
 
-        _isUserAuthenticated = await PrerenderStateService.GetValue($"{nameof(Header)}-isUserAuthenticated", AuthenticationStateProvider.IsUserAuthenticatedAsync);
+        _isUserAuthenticated = await PrerenderStateService.GetValue($"{nameof(Header)}-isUserAuthenticated", async () => (await AuthenticationStateTask).User.IsAuthenticated());
 
         await base.OnInitAsync();
     }
@@ -20,7 +20,7 @@ async void VerifyUserIsAuthenticatedOrNot(Task<AuthenticationState> task)
     {
         try
         {
-            _isUserAuthenticated = await AuthenticationStateProvider.IsUserAuthenticatedAsync();
+            _isUserAuthenticated = (await task).User.IsAuthenticated();
         }
         catch (Exception ex)
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/MainLayout.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/MainLayout.razor.cs
index 43e8aa6045..572c4a0a94 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/MainLayout.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/MainLayout.razor.cs
@@ -9,12 +9,14 @@ public partial class MainLayout : IDisposable
     private bool _isUserAuthenticated;
     private ErrorBoundary ErrorBoundaryRef = default!;
 
-    [AutoInject] private IPrerenderStateService _stateService = default!;
+    [AutoInject] private IPrerenderStateService _prerenderStateService = default!;
 
     [AutoInject] private IExceptionHandler _exceptionHandler = default!;
 
     [AutoInject] private AppAuthenticationStateProvider _authStateProvider = default!;
 
+    [CascadingParameter] public Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
     protected override void OnParametersSet()
     {
         // TODO: we can try to recover from exception after rendering the ErrorBoundary with this line.
@@ -30,7 +32,7 @@ protected override async Task OnInitializedAsync()
         {
             _authStateProvider.AuthenticationStateChanged += VerifyUserIsAuthenticatedOrNot;
 
-            _isUserAuthenticated = await _stateService.GetValue($"{nameof(MainLayout)}-isUserAuthenticated", _authStateProvider.IsUserAuthenticatedAsync);
+            _isUserAuthenticated = await _prerenderStateService.GetValue($"{nameof(MainLayout)}-isUserAuthenticated", async () => (await AuthenticationStateTask).User.IsAuthenticated());
 
             await base.OnInitializedAsync();
         }
@@ -44,7 +46,7 @@ async void VerifyUserIsAuthenticatedOrNot(Task<AuthenticationState> task)
     {
         try
         {
-            _isUserAuthenticated = await _authStateProvider.IsUserAuthenticatedAsync();
+            _isUserAuthenticated = (await task).User.IsAuthenticated();
         }
         catch (Exception ex)
         {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/NavMenu.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/NavMenu.razor.cs
index 8dbd07c0fc..d5335838a0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/NavMenu.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/NavMenu.razor.cs
@@ -13,7 +13,7 @@ public partial class NavMenu : IDisposable
     private List<BitNavItem> _navItems = [];
     private Action _unsubscribe = default!;
 
-    [AutoInject] private NavigationManager _navManager { get; set; } = default!;
+    [AutoInject] private NavigationManager _navManager = default!;
 
     [Parameter] public bool IsMenuOpen { get; set; }
 
@@ -73,7 +73,7 @@ protected override async Task OnInitAsync()
             }
         ];
 
-        _unsubscribe = PubSubService.Subscribe(PubSubMessages.PROFILE_UPDATED, payload =>
+        _unsubscribe = PubSubService.Subscribe(PubSubMessages.PROFILE_UPDATED, async payload =>
         {
             if (payload is null) return;
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/NotAuthorizedComponent.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/NotAuthorizedComponent.razor.cs
index 67701f75f1..9865054bc5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/NotAuthorizedComponent.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/NotAuthorizedComponent.razor.cs
@@ -5,6 +5,7 @@ public partial class NotAuthorizedComponent
     private ClaimsPrincipal _user = default!;
 
     [CascadingParameter] public Task<AuthenticationState> AuthenticationState { get; set; } = default!;
+    [SupplyParameterFromQuery(Name = "redirect-url"), Parameter] public string? RedirectUrl { get; set; }
 
     protected override async Task OnParamsSetAsync()
     {
@@ -13,36 +14,52 @@ protected override async Task OnParamsSetAsync()
         await base.OnParamsSetAsync();
     }
 
-    protected override void OnAfterRender(bool firstRender)
+    protected override async Task OnAfterFirstRenderAsync()
     {
-        base.OnAfterRender(firstRender);
+        string? refresh_token = await JSRuntime.GetLocalStorage("refresh_token");
 
-        if (firstRender is false) return;
+        // Let's update the access token by refreshing it when a refresh token is available.
+        // Following this procedure, the newly acquired access token may now include the necessary roles or claims.
+        // To prevent infinitie redirect loop, let's append refresh_token=false to the url, so we only redirect in case no refresh_token=false is present
 
-        try
+        if (string.IsNullOrEmpty(refresh_token) is false && RedirectUrl?.Contains("refresh_token=false", StringComparison.InvariantCulture) is null or false)
         {
-            if (_user.Identity?.IsAuthenticated is false)
+            // In the AuthenticationStateProvider, the access_token is refreshed using the refresh_token (if available).
+            // To ensure this process, consider removing the access_token, prompting the AuthenticationStateProvider to initiate a refresh automatically.
+            await JSRuntime.RemoveCookie("access_token");
+            await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
+
+            if ((await AuthenticationStateTask).User.IsAuthenticated())
             {
-                RedirectToSignInPage();
+                if (RedirectUrl is not null)
+                {
+                    var @char = RedirectUrl.Contains('?') ? '&' : '?'; // The RedirectUrl may already include a query string.
+                    NavigationManager.NavigateTo($"{RedirectUrl}{@char}refresh_token=false");
+                }
             }
         }
-        catch (Exception exp)
+
+        if ((await AuthenticationStateTask).User.IsAuthenticated() is false)
         {
-            ExceptionHandler.Handle(exp);
+            // If neither the refresh_token nor the access_token is present, proceed to the sign-in page.
+            await SignIn();
         }
+
+        await base.OnAfterFirstRenderAsync();
     }
 
     private async Task SignIn()
     {
-        await AuthenticationService.SignOut();
+        await JSRuntime.RemoveAuthTokens();
+
+        await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
 
         RedirectToSignInPage();
     }
 
     private void RedirectToSignInPage()
     {
-        var redirectUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
-
-        NavigationManager.NavigateTo($"/sign-in?redirectUrl={redirectUrl}");
+        var redirectUrl = RedirectUrl ?? NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
+        NavigationManager.NavigateTo($"/sign-in{(string.IsNullOrEmpty(redirectUrl) ? "" : $"?redirect-url={redirectUrl}")}");
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/SignOutConfirmModal.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/SignOutConfirmModal.razor.cs
index c9d6141f9a..9dc9c7b3af 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/SignOutConfirmModal.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/Shared/SignOutConfirmModal.razor.cs
@@ -2,8 +2,7 @@
 
 public partial class SignOutConfirmModal
 {
-    [Parameter]
-    public bool IsOpen { get; set; }
+    [Parameter] public bool IsOpen { get; set; }
 
     [Parameter] public EventCallback<bool> IsOpenChanged { get; set; }
 
@@ -16,7 +15,9 @@ private async Task CloseModal()
 
     private async Task SignOut()
     {
-        await AuthenticationService.SignOut();
+        await JSRuntime.RemoveAuthTokens();
+
+        await AuthenticationStateProvider.RaiseAuthenticationStateHasChanged();
 
         await CloseModal();
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/compilerconfig.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/compilerconfig.json
index 7b3e085b6d..00764d38f6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/compilerconfig.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Core/compilerconfig.json
@@ -1,8 +1,8 @@
-//+:cnd:noEmit
+//+:cnd:noEmit
 [
     {
-        "outputFile": "Shared/MainLayout.razor.css",
-        "inputFile": "Shared/MainLayout.razor.scss",
+        "outputFile": "wwwroot/styles/app.css",
+        "inputFile": "Styles/app.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -19,8 +19,8 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/MessageBox.razor.css",
-        "inputFile": "Shared/MessageBox.razor.scss",
+        "outputFile": "Shared/Footer.razor.css",
+        "inputFile": "Shared/Footer.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -31,20 +31,20 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Footer.razor.css",
-        "inputFile": "Shared/Footer.razor.scss",
+        "outputFile": "Shared/MainLayout.razor.css",
+        "inputFile": "Shared/MainLayout.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/NavMenu.razor.css",
-        "inputFile": "Shared/NavMenu.razor.scss",
+        "outputFile": "Shared/MessageBox.razor.css",
+        "inputFile": "Shared/MessageBox.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/NotAuthorizedComponent.razor.css",
-        "inputFile": "Shared/NotAuthorizedComponent.razor.scss",
+        "outputFile": "Shared/NavMenu.razor.css",
+        "inputFile": "Shared/NavMenu.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -55,14 +55,20 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/PageNotFound.razor.css",
-        "inputFile": "Shared/PageNotFound.razor.scss",
+        "outputFile": "Pages/HomePage.razor.css",
+        "inputFile": "Pages/HomePage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/HomePage.razor.css",
-        "inputFile": "Pages/HomePage.razor.scss",
+        "outputFile": "Pages/NotAuthorizedPage.razor.css",
+        "inputFile": "Pages/NotAuthorizedPage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Pages/NotFoundPage.razor.css",
+        "inputFile": "Pages/NotFoundPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -73,14 +79,14 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/SignUpPage.razor.css",
-        "inputFile": "Pages/Identity/SignUpPage.razor.scss",
+        "outputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.css",
+        "inputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/SignInPage.razor.css",
-        "inputFile": "Pages/Identity/SignInPage.razor.scss",
+        "outputFile": "Pages/Identity/EditProfilePage.razor.css",
+        "inputFile": "Pages/Identity/EditProfilePage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -103,27 +109,21 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/EditProfilePage.razor.css",
-        "inputFile": "Pages/Identity/EditProfilePage.razor.scss",
-        "minify": { "enabled": false },
-        "options": { "sourceMap": false }
-    },
-    {
-        "outputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.css",
-        "inputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.scss",
+        "outputFile": "Pages/Identity/SignInPage.razor.css",
+        "inputFile": "Pages/Identity/SignInPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "wwwroot/styles/app.css",
-        "inputFile": "Styles/app.scss",
+        "outputFile": "Pages/Identity/SignUpPage.razor.css",
+        "inputFile": "Pages/Identity/SignUpPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     //#if (sample == "Todo")
     {
-        "outputFile": "Pages/TodoPage.razor.css",
-        "inputFile": "Pages/TodoPage.razor.scss",
+        "outputFile": "Pages/Todo/TodoPage.razor.css",
+        "inputFile": "Pages/Todo/TodoPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Extensions/IServiceCollectionExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Extensions/IServiceCollectionExtensions.cs
index cfa1f63049..e7a64097dc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Extensions/IServiceCollectionExtensions.cs
@@ -7,8 +7,8 @@ public static class IServiceCollectionExtensions
     public static IServiceCollection AddClientWebServices(this IServiceCollection services)
     {
         // Services being registered here can get injected in web (blazor web assembly & blazor server)
-        services.AddScoped<IBitDeviceCoordinator, WebDeviceCoordinator>();
-        services.AddScoped<IExceptionHandler, WebExceptionHandler>();
+        services.AddTransient<IBitDeviceCoordinator, WebDeviceCoordinator>();
+        services.AddTransient<IExceptionHandler, WebExceptionHandler>();
 
         return services;
     }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Program.BlazorWebAssembly.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Program.BlazorWebAssembly.cs
index 73ec17227d..68e7e6e12e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Program.BlazorWebAssembly.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Program.BlazorWebAssembly.cs
@@ -23,17 +23,16 @@ public static WebAssemblyHost CreateHostBuilder(string[] args)
             apiServerAddress = new Uri($"{builder.HostEnvironment.BaseAddress}{apiServerAddress}");
         }
 
-        builder.Services.AddSingleton(sp =>
+        builder.Services.AddTransient(sp =>
         {
-            var handler = sp.GetRequiredService<LocalizationDelegatingHandler>();
+            var handler = sp.GetRequiredService<RequestHeadersDelegationHandler>();
             HttpClient httpClient = new(handler)
             {
                 BaseAddress = apiServerAddress
             };
             return httpClient;
         });
-        builder.Services.AddScoped<LazyAssemblyLoader>();
-        builder.Services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();
+        builder.Services.AddTransient<LazyAssemblyLoader>();
         builder.Services.AddTransient<IAuthTokenProvider, ClientSideAuthTokenProvider>();
 
         builder.Services.AddSharedServices();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Services/ServerSideAuthTokenProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Services/ServerSideAuthTokenProvider.cs
index eb0a119e28..0acf472305 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Services/ServerSideAuthTokenProvider.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Services/ServerSideAuthTokenProvider.cs
@@ -13,20 +13,20 @@ namespace Boilerplate.Client.Web.Services;
 #if BlazorServer
 public partial class ServerSideAuthTokenProvider : IAuthTokenProvider
 {
-    [AutoInject] private IJSRuntime _jsRuntime = default!;
     [AutoInject] private IHttpContextAccessor _httpContextAccessor = default!;
+    [AutoInject] private IJSRuntime _jsRuntime = default!;
 
     private static readonly PropertyInfo IsInitializedProp = Assembly.Load("Microsoft.AspNetCore.Components.Server")!
                                                                 .GetType("Microsoft.AspNetCore.Components.Server.Circuits.RemoteJSRuntime")!
                                                                 .GetProperty("IsInitialized")!;
 
+    public bool IsInitialized => (bool)IsInitializedProp.GetValue(_jsRuntime)!;
+
     public async Task<string?> GetAccessTokenAsync()
     {
-        var isInitialized = (bool)IsInitializedProp.GetValue(_jsRuntime)!;
-
-        if (isInitialized)
+        if (IsInitialized)
         {
-            return await _jsRuntime.InvokeAsync<string>("App.getCookie", "access_token");
+            return await _jsRuntime.GetCookie("access_token");
         }
 
         return _httpContextAccessor.HttpContext?.Request.Cookies["access_token"];
@@ -42,6 +42,8 @@ public ServerSideAuthTokenProvider(IHttpContextAccessor httpContextAccessor)
         _httpContextAccessor = httpContextAccessor;
     }
 
+    public bool IsInitialized => false;
+
     public async Task<string?> GetAccessTokenAsync()
     {
         return _httpContextAccessor.HttpContext?.Request.Cookies["access_token"];
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Startup/Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Startup/Services.cs
index cd2aeba301..1a62b5f172 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Startup/Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Startup/Services.cs
@@ -11,10 +11,10 @@ public static class Services
 {
     public static void Add(IServiceCollection services, IConfiguration configuration)
     {
-        services.AddScoped(sp =>
+        services.AddTransient(sp =>
         {
             Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.Absolute, out var apiServerAddress);
-            var handler = sp.GetRequiredService<LocalizationDelegatingHandler>();
+            var handler = sp.GetRequiredService<RequestHeadersDelegationHandler>();
             HttpClient httpClient = new(handler)
             {
                 BaseAddress = apiServerAddress
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Infra/Iac/Boilerplate.Iac.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Infra/Iac/Boilerplate.Iac.csproj
index 407dcb746b..e7055021bc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Infra/Iac/Boilerplate.Iac.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Infra/Iac/Boilerplate.Iac.csproj
@@ -3,8 +3,6 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Infra/Iac/BpStack.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Infra/Iac/BpStack.cs
index 12b842ee1b..bc9aac36df 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Infra/Iac/BpStack.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Infra/Iac/BpStack.cs
@@ -157,7 +157,7 @@ public BpStack()
                     },
                     new NameValuePairArgs
                     {
-                        Name = "AppSettings__JwtSettings__IdentityCertificatePassword",
+                        Name = "AppSettings__IdentitySettings__IdentityCertificatePassword",
                         Value = $"@Microsoft.KeyVault(VaultName={vaultName};SecretName={identityCertificatePasswordSecretName})"
                     },
                 ],
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/AppSettings.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/AppSettings.cs
index caf9a84962..21381051f0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/AppSettings.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/AppSettings.cs
@@ -4,8 +4,6 @@ public class AppSettings
 {
     public IdentitySettings IdentitySettings { get; set; } = default!;
 
-    public JwtSettings JwtSettings { get; set; } = default!;
-
     public EmailSettings EmailSettings { get; set; } = default!;
 
     public HealthCheckSettings HealthCheckSettings { get; set; } = default!;
@@ -22,6 +20,11 @@ public class HealthCheckSettings
 
 public class IdentitySettings
 {
+    public TimeSpan BearerTokenExpiration { get; set; }
+    public TimeSpan RefreshTokenExpiration { get; set; }
+    public string Issuer { get; set; } = default!;
+    public string Audience { get; set; } = default!;
+    public string IdentityCertificatePassword { get; set; } = default!;
     public bool PasswordRequireDigit { get; set; }
     public int PasswordRequiredLength { get; set; }
     public bool PasswordRequireNonAlphanumeric { get; set; }
@@ -32,15 +35,6 @@ public class IdentitySettings
     public TimeSpan ResetPasswordEmailResendDelay { get; set; }
 }
 
-public class JwtSettings
-{
-    public string IdentityCertificatePassword { get; set; } = default!;
-    public string Issuer { get; set; } = default!;
-    public string Audience { get; set; } = default!;
-    public int NotBeforeMinutes { get; set; }
-    public int ExpirationMinutes { get; set; }
-}
-
 public class EmailSettings
 {
     public string Host { get; set; } = default!;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Boilerplate.Server.Api.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Boilerplate.Server.Api.csproj
index 2b4c7f9d7c..7d125ad810 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Boilerplate.Server.Api.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Boilerplate.Server.Api.csproj
@@ -27,7 +27,7 @@
         <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
 
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-
+        <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.0" />
 
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.3" />
@@ -67,7 +67,6 @@
         <Using Include="Boilerplate.Server.Api.Data" />
         <Using Include="Boilerplate.Server.Api.Mappers" />
         <Using Include="Boilerplate.Shared.Enums" />
-        <Using Include="Boilerplate.Server.Api.Services.Contracts" />
         <Using Include="Microsoft.AspNetCore.Authorization" />
         <Using Include="Microsoft.AspNetCore.OData.Query" />
     </ItemGroup>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/AppControllerBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/AppControllerBase.cs
index dbd3020a72..078932c1af 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/AppControllerBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/AppControllerBase.cs
@@ -7,6 +7,4 @@ public partial class AppControllerBase : ControllerBase
     [AutoInject] protected AppDbContext DbContext = default!;
 
     [AutoInject] protected IStringLocalizer<AppStrings> Localizer = default!;
-
-    [AutoInject] protected IUserInformationProvider UserInformationProvider = default!;
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/AttachmentController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/AttachmentController.cs
index dc9eecace9..a13425ddc3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/AttachmentController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/AttachmentController.cs
@@ -20,7 +20,7 @@ public async Task UploadProfileImage(IFormFile? file, CancellationToken cancella
         if (file is null)
             throw new BadRequestException();
 
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         var user = await _userManager.FindByIdAsync(userId.ToString());
 
@@ -74,7 +74,9 @@ public async Task UploadProfileImage(IFormFile? file, CancellationToken cancella
 
             user.ProfileImageName = destFileName;
 
-            await _userManager.UpdateAsync(user);
+            var result = await _userManager.UpdateAsync(user);
+            if (!result.Succeeded)
+                throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
         }
         catch
         {
@@ -92,7 +94,7 @@ public async Task UploadProfileImage(IFormFile? file, CancellationToken cancella
     [HttpDelete]
     public async Task RemoveProfileImage()
     {
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         var user = await _userManager.FindByIdAsync(userId.ToString());
 
@@ -108,7 +110,9 @@ public async Task RemoveProfileImage()
 
         user.ProfileImageName = null;
 
-        await _userManager.UpdateAsync(user);
+        var result = await _userManager.UpdateAsync(user);
+        if (!result.Succeeded)
+            throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
 
         SystemFile.Delete(filePath);
     }
@@ -116,7 +120,7 @@ public async Task RemoveProfileImage()
     [HttpGet]
     public async Task<IActionResult> GetProfileImage()
     {
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         var user = await _userManager.FindByIdAsync(userId.ToString());
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Categories/CategoryController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Categories/CategoryController.cs
index 0c5d2a070e..0070f8c627 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Categories/CategoryController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Categories/CategoryController.cs
@@ -38,7 +38,7 @@ public async Task<PagedResult<CategoryDto>> GetCategories(ODataQueryOptions<Cate
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<CategoryDto>(await query.ToListAsync(cancellationToken), totalCount);
+        return new PagedResult<CategoryDto>(query.AsAsyncEnumerable(), totalCount);
     }
 
     [HttpPost]
@@ -65,15 +65,13 @@ public async Task<CategoryDto> Update(CategoryDto dto, CancellationToken cancell
 
         await DbContext.SaveChangesAsync(cancellationToken);
 
-        categoryToUpdate.Patch(dto);
-
-        return dto;
+        return categoryToUpdate.Map();
     }
 
     [HttpDelete("{id:int}")]
     public async Task Delete(int id, CancellationToken cancellationToken)
     {
-        if (await DbContext.Products.AnyAsync(p => p.CategoryId == id))
+        if (await DbContext.Products.AnyAsync(p => p.CategoryId == id, cancellationToken))
         {
             throw new BadRequestException(Localizer[nameof(AppStrings.CategoryNotEmpty)]);
         }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/AuthController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/IdentityController.cs
similarity index 71%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/AuthController.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/IdentityController.cs
index cb32eb61d1..feb46c29a7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/AuthController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/IdentityController.cs
@@ -5,6 +5,7 @@
 using Boilerplate.Server.Api.Resources;
 using Boilerplate.Shared.Dtos.Identity;
 using FluentEmail.Core;
+using Microsoft.AspNetCore.Authentication.BearerToken;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
@@ -12,12 +13,10 @@ namespace Boilerplate.Server.Api.Controllers.Identity;
 
 [Microsoft.AspNetCore.Mvc.Route("api/[controller]/[action]")]
 [ApiController, AllowAnonymous]
-public partial class AuthController : AppControllerBase
+public partial class IdentityController : AppControllerBase
 {
     [AutoInject] private UserManager<User> _userManager = default!;
 
-    [AutoInject] private IJwtService _jwtService = default!;
-
     [AutoInject] private SignInManager<User> _signInManager = default!;
 
     [AutoInject] private IFluentEmail _fluentEmail = default!;
@@ -26,7 +25,9 @@ public partial class AuthController : AppControllerBase
 
     [AutoInject] private HtmlRenderer _htmlRenderer = default!;
 
-    [AutoInject] protected IStringLocalizer<IdentityStrings> IdentityLocalizer = default!;
+    [AutoInject] private IStringLocalizer<IdentityStrings> _identityLocalizer = default!;
+
+    [AutoInject] private IOptionsMonitor<BearerTokenOptions> _bearerTokenOptions = default!;
 
     /// <summary>
     /// By leveraging summary tags in your controller's actions and DTO properties you can make your codes much easier to maintain.
@@ -47,16 +48,20 @@ public async Task SignUp(SignUpRequestDto signUpRequest, CancellationToken cance
             }
             else
             {
-                await _userManager.DeleteAsync(existingUser);
+                var deleteResult = await _userManager.DeleteAsync(existingUser);
+                if (!deleteResult.Succeeded)
+                    throw new ResourceValidationException(deleteResult.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
                 userToAdd.ConfirmationEmailRequestedOn = existingUser.ConfirmationEmailRequestedOn;
             }
         }
 
+        userToAdd.LockoutEnabled = true;
+
         var result = await _userManager.CreateAsync(userToAdd, signUpRequest.Password!);
 
         if (result.Succeeded is false)
         {
-            throw new ResourceValidationException(result.Errors.Select(e => IdentityLocalizer.GetString(e.Code, signUpRequest.Email!)).ToArray());
+            throw new ResourceValidationException(result.Errors.Select(e => new LocalizedString(e.Code, e.Description)).ToArray());
         }
 
         await SendConfirmationEmail(new() { Email = userToAdd.Email }, userToAdd, cancellationToken);
@@ -121,6 +126,76 @@ private async Task SendConfirmationEmail(SendConfirmationEmailRequestDto sendCon
             throw new ResourceValidationException(result.ErrorMessages.Select(err => Localizer[err]).ToArray());
     }
 
+    [HttpGet]
+    public async Task<ActionResult> ConfirmEmail(string email, string token)
+    {
+        var user = await _userManager.FindByEmailAsync(email);
+
+        if (user is null)
+            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserNameNotFound), email));
+
+        var emailConfirmed = user.EmailConfirmed;
+        var errors = string.Empty;
+
+        if (emailConfirmed is false)
+        {
+            var result = await _userManager.ConfirmEmailAsync(user, token);
+            if (!result.Succeeded)
+                errors = string.Join(", ", result.Errors.Select(e => $"{e.Code}: {e.Description}"));
+            emailConfirmed = result.Succeeded;
+        }
+
+        string url = $"/email-confirmation?email={email}&email-confirmed={emailConfirmed}{(string.IsNullOrEmpty(errors) ? "" : ($"&error={errors}"))}";
+
+        return Redirect(url);
+    }
+
+    [HttpPost]
+    public async Task SignIn(SignInRequestDto signInRequest)
+    {
+        _signInManager.AuthenticationScheme = IdentityConstants.BearerScheme;
+
+        var result = await _signInManager.PasswordSignInAsync(signInRequest.UserName!, signInRequest.Password!, isPersistent: false, lockoutOnFailure: true);
+
+        if (result.IsLockedOut)
+        {
+            var user = await _userManager.FindByNameAsync(signInRequest.UserName!);
+            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserLockedOut), (DateTimeOffset.UtcNow - user!.LockoutEnd!).Value.ToString("mm\\:ss")));
+        }
+
+        /* if (result.RequiresTwoFactor)
+        {
+            if (!string.IsNullOrEmpty(signInRequest.TwoFactorCode))
+            {
+                result = await _signInManager.TwoFactorAuthenticatorSignInAsync(signInRequest.TwoFactorCode, rememberClient: true);
+            }
+            else if (!string.IsNullOrEmpty(signInRequest.TwoFactorRecoveryCode))
+            {
+                result = await _signInManager.TwoFactorRecoveryCodeSignInAsync(signInRequest.TwoFactorRecoveryCode);
+            }
+        } */
+
+        if (result.Succeeded is false)
+            throw new UnauthorizedException(Localizer.GetString(nameof(AppStrings.InvalidUsernameOrPassword)));
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<TokenResponseDto>> Refresh(RefreshRequestDto refreshRequest)
+    {
+        var refreshTokenProtector = _bearerTokenOptions.Get(IdentityConstants.BearerScheme).RefreshTokenProtector;
+        var refreshTicket = refreshTokenProtector.Unprotect(refreshRequest.RefreshToken);
+
+        if (refreshTicket?.Properties?.ExpiresUtc is not { } expiresUtc || DateTimeOffset.UtcNow >= expiresUtc ||
+                await _signInManager.ValidateSecurityStampAsync(refreshTicket.Principal) is not User user)
+        {
+            return Challenge();
+        }
+
+        var newPrincipal = await _signInManager.CreateUserPrincipalAsync(user);
+
+        return SignIn(newPrincipal, authenticationScheme: IdentityConstants.BearerScheme);
+    }
+
     [HttpPost]
     public async Task SendResetPasswordEmail(SendResetPasswordEmailRequestDto sendResetPasswordEmailRequest
           , CancellationToken cancellationToken)
@@ -139,11 +214,7 @@ public async Task SendResetPasswordEmail(SendResetPasswordEmailRequestDto sendRe
 
         var resetPasswordLink = $"reset-password?email={HttpUtility.UrlEncode(user.Email)}&token={HttpUtility.UrlEncode(token)}";
 
-#if BlazorServer
-        resetPasswordLink = $"{AppSettings.WebServerAddress}{resetPasswordLink}";
-#else
         resetPasswordLink = $"{new Uri($"{HttpContext.Request.Scheme}://{HttpContext.Request.Host}{HttpContext.Request.PathBase}")}{resetPasswordLink}";
-#endif
 
         var body = await _htmlRenderer.Dispatcher.InvokeAsync(async () =>
         {
@@ -176,27 +247,6 @@ public async Task SendResetPasswordEmail(SendResetPasswordEmailRequestDto sendRe
             throw new ResourceValidationException(result.ErrorMessages.Select(err => Localizer[err]).ToArray());
     }
 
-    [HttpGet]
-    public async Task<ActionResult> ConfirmEmail(string email, string token)
-    {
-        var user = await _userManager.FindByEmailAsync(email);
-
-        if (user is null)
-            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserNameNotFound), email));
-
-        var emailConfirmed = user.EmailConfirmed || (await _userManager.ConfirmEmailAsync(user, token)).Succeeded;
-
-        string url = $"email-confirmation?email={email}&email-confirmed={emailConfirmed}";
-
-#if BlazorServer
-        url = $"{AppSettings.WebServerAddress}{url}";
-#else
-        url = $"/{url}";
-#endif
-
-        return Redirect(url);
-    }
-
     [HttpPost]
     public async Task ResetPassword(ResetPasswordRequestDto resetPasswordRequest)
     {
@@ -208,25 +258,6 @@ public async Task ResetPassword(ResetPasswordRequestDto resetPasswordRequest)
         var result = await _userManager.ResetPasswordAsync(user, resetPasswordRequest.Token!, resetPasswordRequest.Password!);
 
         if (!result.Succeeded)
-            throw new ResourceValidationException(result.Errors.Select(e => IdentityLocalizer.GetString(e.Code, resetPasswordRequest.Email!)).ToArray());
-    }
-
-    [HttpPost]
-    public async Task<SignInResponseDto> SignIn(SignInRequestDto signInRequest)
-    {
-        var user = await _userManager.FindByNameAsync(signInRequest.UserName!);
-
-        if (user is null)
-            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserNameNotFound), signInRequest.UserName!));
-
-        var checkPasswordResult = await _signInManager.CheckPasswordSignInAsync(user, signInRequest.Password!, lockoutOnFailure: true);
-
-        if (checkPasswordResult.IsLockedOut)
-            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.UserLockedOut), (DateTimeOffset.UtcNow - user.LockoutEnd!).Value.ToString("mm\\:ss")));
-
-        if (!checkPasswordResult.Succeeded)
-            throw new BadRequestException(Localizer.GetString(nameof(AppStrings.InvalidUsernameOrPassword), signInRequest.UserName!));
-
-        return await _jwtService.GenerateToken(user);
+            throw new ResourceValidationException(result.Errors.Select(e => new LocalizedString(e.Code, e.Description)).ToArray());
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/UserController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/UserController.cs
index e72638f6b8..aa8584eaf7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/UserController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Identity/UserController.cs
@@ -34,7 +34,9 @@ public async Task<UserDto> Update(EditUserDto userDto, CancellationToken cancell
 
         userDto.Patch(user);
 
-        await _userManager.UpdateAsync(user);
+        var result = await _userManager.UpdateAsync(user);
+        if (!result.Succeeded)
+            throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
 
         return await GetCurrentUser(cancellationToken);
     }
@@ -42,11 +44,13 @@ public async Task<UserDto> Update(EditUserDto userDto, CancellationToken cancell
     [HttpDelete]
     public async Task Delete(CancellationToken cancellationToken)
     {
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         var user = await _userManager.Users.FirstOrDefaultAsync(user => user.Id == userId, cancellationToken)
                     ?? throw new ResourceNotFoundException();
 
-        await _userManager.DeleteAsync(user);
+        var result = await _userManager.DeleteAsync(user);
+        if (!result.Succeeded)
+            throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Products/ProductController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Products/ProductController.cs
index 842ee7bad8..e43b7d321f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Products/ProductController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Products/ProductController.cs
@@ -38,7 +38,7 @@ public async Task<PagedResult<ProductDto>> GetProducts(ODataQueryOptions<Product
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<ProductDto>(await query.ToListAsync(cancellationToken), totalCount);
+        return new PagedResult<ProductDto>(query.AsAsyncEnumerable(), totalCount);
     }
 
     [HttpPost]
@@ -65,9 +65,7 @@ public async Task<ProductDto> Update(ProductDto dto, CancellationToken cancellat
 
         await DbContext.SaveChangesAsync(cancellationToken);
 
-        productToUpdate.Patch(dto);
-
-        return dto;
+        return productToUpdate.Map();
     }
 
     [HttpDelete("{id:int}")]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Todo/TodoItemController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Todo/TodoItemController.cs
index 4d1878595a..3cbeba390f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Todo/TodoItemController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Controllers/Todo/TodoItemController.cs
@@ -10,7 +10,7 @@ public partial class TodoItemController : AppControllerBase
     [HttpGet, EnableQuery]
     public IQueryable<TodoItemDto> Get()
     {
-        var userId = UserInformationProvider.GetUserId();
+        var userId = User.GetUserId();
 
         return DbContext.TodoItems
             .Where(t => t.UserId == userId)
@@ -41,7 +41,7 @@ public async Task<PagedResult<TodoItemDto>> GetTodoItems(ODataQueryOptions<TodoI
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<TodoItemDto>(await query.ToListAsync(cancellationToken), totalCount);
+        return new PagedResult<TodoItemDto>(query.AsAsyncEnumerable(), totalCount);
     }
 
     [HttpPost]
@@ -49,7 +49,7 @@ public async Task<TodoItemDto> Create(TodoItemDto dto, CancellationToken cancell
     {
         var todoItemToAdd = dto.Map();
 
-        todoItemToAdd.UserId = UserInformationProvider.GetUserId();
+        todoItemToAdd.UserId = User.GetUserId();
 
         todoItemToAdd.Date = DateTimeOffset.UtcNow;
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/AppDbContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/AppDbContext.cs
index 9b91b909c6..a3816ed3cf 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/AppDbContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/AppDbContext.cs
@@ -6,13 +6,15 @@
 using Boilerplate.Server.Api.Models.Categories;
 using Boilerplate.Server.Api.Models.Products;
 //#endif
+using Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Boilerplate.Server.Api.Data;
 
 public class AppDbContext(DbContextOptions<AppDbContext> options) 
-    : IdentityDbContext<User, Role, int>(options)
+    : IdentityDbContext<User, Role, int>(options), IDataProtectionKeyContext
 {
+    public DbSet<DataProtectionKey> DataProtectionKeys { get; set; }
 
     //#if (sample == "Todo")
     public DbSet<TodoItem> TodoItems { get; set; }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Configurations/Identity/UserConfiguration.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Configurations/Identity/UserConfiguration.cs
index c20556ec32..1be6f2b354 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Configurations/Identity/UserConfiguration.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Configurations/Identity/UserConfiguration.cs
@@ -12,6 +12,7 @@ public void Configure(EntityTypeBuilder<User> builder)
         {
             Id = 1,
             EmailConfirmed = true,
+            LockoutEnabled = true,
             Gender = Gender.Other,
             BirthDate = new DateTime(2023, 1, 1),
             FullName = "Boilerplate test account",
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231113190400_InitialMigration.Designer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231121162004_InitialMigration.Designer.cs
similarity index 96%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231113190400_InitialMigration.Designer.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231121162004_InitialMigration.Designer.cs
index 41f7057cc0..f544b56464 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231113190400_InitialMigration.Designer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231121162004_InitialMigration.Designer.cs
@@ -12,7 +12,7 @@
 namespace Boilerplate.Server.Api.Data.Migrations
 {
     [DbContext(typeof(AppDbContext))]
-    [Migration("20231113190400_InitialMigration")]
+    [Migration("20231121162004_InitialMigration")]
     partial class InitialMigration
     {
         /// <inheritdoc />
@@ -199,17 +199,17 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                             Id = 1,
                             AccessFailedCount = 0,
                             BirthDate = new DateTimeOffset(new DateTime(2023, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 1, 0, 0, 0)),
-                            ConcurrencyStamp = "abc2cc9f-82d8-4d0f-8b30-bdf46771be8a",
+                            ConcurrencyStamp = "315e1a26-5b3a-4544-8e91-2760cd28e231",
                             Email = "test@bitplatform.dev",
                             EmailConfirmed = true,
                             FullName = "Boilerplate test account",
                             Gender = 2,
-                            LockoutEnabled = false,
+                            LockoutEnabled = true,
                             NormalizedEmail = "TEST@BITPLATFORM.DEV",
                             NormalizedUserName = "TEST@BITPLATFORM.DEV",
-                            PasswordHash = "AQAAAAIAAYagAAAAEPoTVhWmCK6tZktIeSD0sVticLeZ1o2EVYZ9tUbY+PPr3tnJ/ZbSn7ZTBq6N+vl7UQ==",
+                            PasswordHash = "AQAAAAIAAYagAAAAEP0v3wxkdWtMkHA3Pp5/JfS+42/Qto9G05p2mta6dncSK37hPxEHa3PGE4aqN30Aag==",
                             PhoneNumberConfirmed = false,
-                            SecurityStamp = "bf6a9576-4c37-40bc-a4c2-7b42f3ec10cf",
+                            SecurityStamp = "959ff4a9-4b07-4cc1-8141-c5fc033daf83",
                             TwoFactorEnabled = false,
                             UserName = "test@bitplatform.dev"
                         });
@@ -484,6 +484,25 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("TodoItems");
                 });
 
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys");
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
                 {
                     b.Property<int>("Id")
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231113190400_InitialMigration.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231121162004_InitialMigration.cs
similarity index 94%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231113190400_InitialMigration.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231121162004_InitialMigration.cs
index 2e5a276d20..4d99bbba2b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231113190400_InitialMigration.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/20231121162004_InitialMigration.cs
@@ -1,4 +1,7 @@
-#nullable disable
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
 
 #pragma warning disable DateTimeOffsetInsteadOfDateTimeAnalyzer
 
@@ -24,6 +27,20 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_Categories", x => x.Id);
             });
 
+        migrationBuilder.CreateTable(
+            name: "DataProtectionKeys",
+            columns: table => new
+            {
+                Id = table.Column<int>(type: "int", nullable: false)
+                    .Annotation("SqlServer:Identity", "1, 1"),
+                FriendlyName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                Xml = table.Column<string>(type: "nvarchar(max)", nullable: true)
+            },
+            constraints: table =>
+            {
+                table.PrimaryKey("PK_DataProtectionKeys", x => x.Id);
+            });
+
         migrationBuilder.CreateTable(
             name: "Roles",
             columns: table => new
@@ -237,7 +254,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
         migrationBuilder.InsertData(
             table: "Users",
             columns: new[] { "Id", "AccessFailedCount", "BirthDate", "ConcurrencyStamp", "ConfirmationEmailRequestedOn", "Email", "EmailConfirmed", "FullName", "Gender", "LockoutEnabled", "LockoutEnd", "NormalizedEmail", "NormalizedUserName", "PasswordHash", "PhoneNumber", "PhoneNumberConfirmed", "ProfileImageName", "ResetPasswordEmailRequestedOn", "SecurityStamp", "TwoFactorEnabled", "UserName" },
-            values: new object[] { 1, 0, new DateTimeOffset(new DateTime(2023, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 1, 0, 0, 0)), "abc2cc9f-82d8-4d0f-8b30-bdf46771be8a", null, "test@bitplatform.dev", true, "Boilerplate test account", 2, false, null, "TEST@BITPLATFORM.DEV", "TEST@BITPLATFORM.DEV", "AQAAAAIAAYagAAAAEPoTVhWmCK6tZktIeSD0sVticLeZ1o2EVYZ9tUbY+PPr3tnJ/ZbSn7ZTBq6N+vl7UQ==", null, false, null, null, "bf6a9576-4c37-40bc-a4c2-7b42f3ec10cf", false, "test@bitplatform.dev" });
+            values: new object[] { 1, 0, new DateTimeOffset(new DateTime(2023, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 1, 0, 0, 0)), "315e1a26-5b3a-4544-8e91-2760cd28e231", null, "test@bitplatform.dev", true, "Boilerplate test account", 2, true, null, "TEST@BITPLATFORM.DEV", "TEST@BITPLATFORM.DEV", "AQAAAAIAAYagAAAAEP0v3wxkdWtMkHA3Pp5/JfS+42/Qto9G05p2mta6dncSK37hPxEHa3PGE4aqN30Aag==", null, false, null, null, "959ff4a9-4b07-4cc1-8141-c5fc033daf83", false, "test@bitplatform.dev" });
 
         migrationBuilder.InsertData(
             table: "Products",
@@ -322,6 +339,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
     /// <inheritdoc />
     protected override void Down(MigrationBuilder migrationBuilder)
     {
+        migrationBuilder.DropTable(
+            name: "DataProtectionKeys");
+
         migrationBuilder.DropTable(
             name: "Products");
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/AppDbContextModelSnapshot.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/AppDbContextModelSnapshot.cs
index 2174370dd2..e1a0934a5e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Data/Migrations/AppDbContextModelSnapshot.cs
@@ -196,17 +196,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                             Id = 1,
                             AccessFailedCount = 0,
                             BirthDate = new DateTimeOffset(new DateTime(2023, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 1, 0, 0, 0)),
-                            ConcurrencyStamp = "abc2cc9f-82d8-4d0f-8b30-bdf46771be8a",
+                            ConcurrencyStamp = "315e1a26-5b3a-4544-8e91-2760cd28e231",
                             Email = "test@bitplatform.dev",
                             EmailConfirmed = true,
                             FullName = "Boilerplate test account",
                             Gender = 2,
-                            LockoutEnabled = false,
+                            LockoutEnabled = true,
                             NormalizedEmail = "TEST@BITPLATFORM.DEV",
                             NormalizedUserName = "TEST@BITPLATFORM.DEV",
-                            PasswordHash = "AQAAAAIAAYagAAAAEPoTVhWmCK6tZktIeSD0sVticLeZ1o2EVYZ9tUbY+PPr3tnJ/ZbSn7ZTBq6N+vl7UQ==",
+                            PasswordHash = "AQAAAAIAAYagAAAAEP0v3wxkdWtMkHA3Pp5/JfS+42/Qto9G05p2mta6dncSK37hPxEHa3PGE4aqN30Aag==",
                             PhoneNumberConfirmed = false,
-                            SecurityStamp = "bf6a9576-4c37-40bc-a4c2-7b42f3ec10cf",
+                            SecurityStamp = "959ff4a9-4b07-4cc1-8141-c5fc033daf83",
                             TwoFactorEnabled = false,
                             UserName = "test@bitplatform.dev"
                         });
@@ -481,6 +481,25 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("TodoItems");
                 });
 
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys");
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
                 {
                     b.Property<int>("Id")
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Extensions/IServiceCollectionExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Extensions/IServiceCollectionExtensions.cs
index 3c7cf815c7..a706f3378c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Extensions/IServiceCollectionExtensions.cs
@@ -5,6 +5,7 @@
 using Boilerplate.Server.Api.Models.Identity;
 using Boilerplate.Server.Api.Services;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.DataProtection;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
@@ -13,11 +14,17 @@ namespace Microsoft.Extensions.DependencyInjection;
 
 public static class IServiceCollectionExtensions
 {
-    public static IServiceCollection AddIdentity(this IServiceCollection services, IConfiguration configuration)
+    public static void AddIdentity(this IServiceCollection services, IConfiguration configuration)
     {
         var appSettings = configuration.GetSection(nameof(AppSettings)).Get<AppSettings>()!;
         var settings = appSettings.IdentitySettings;
 
+        var certificatePath = Path.Combine(Directory.GetCurrentDirectory(), "IdentityCertificate.pfx");
+
+        services.AddDataProtection()
+            .PersistKeysToDbContext<AppDbContext>()
+            .ProtectKeysWithCertificate(new X509Certificate2(certificatePath, appSettings.IdentitySettings.IdentityCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet));
+
         services.AddIdentity<User, Role>(options =>
         {
             options.User.RequireUniqueEmail = settings.RequireUniqueEmail;
@@ -27,33 +34,26 @@ public static IServiceCollection AddIdentity(this IServiceCollection services, I
             options.Password.RequireUppercase = settings.PasswordRequireUppercase;
             options.Password.RequireNonAlphanumeric = settings.PasswordRequireNonAlphanumeric;
             options.Password.RequiredLength = settings.PasswordRequiredLength;
-        }).AddEntityFrameworkStores<AppDbContext>().AddDefaultTokenProviders();
-
-        return services;
-    }
-
-    public static IServiceCollection AddJwt(this IServiceCollection services, IConfiguration configuration)
-    {
-        // https://github.com/dotnet/aspnetcore/issues/4660
-        JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
-        JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
-        JwtSecurityTokenHandler.DefaultOutboundClaimTypeMap.Clear();
-
-        var appSettings = configuration.GetSection(nameof(AppSettings)).Get<AppSettings>();
-        var settings = appSettings.JwtSettings;
-
-        services.AddScoped<IJwtService, JwtService>();
+        })
+            .AddEntityFrameworkStores<AppDbContext>()
+            .AddDefaultTokenProviders()
+            .AddErrorDescriber<AppIdentityErrorDescriber>()
+            .AddApiEndpoints();
 
         services.AddAuthentication(options =>
         {
-            options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-            options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-            options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
-        }).AddJwtBearer(options =>
+            options.DefaultAuthenticateScheme = IdentityConstants.BearerScheme;
+            options.DefaultChallengeScheme = IdentityConstants.BearerScheme;
+            options.DefaultScheme = IdentityConstants.BearerScheme;
+        })
+        .AddBearerToken(IdentityConstants.BearerScheme, options =>
         {
+            options.BearerTokenExpiration = settings.BearerTokenExpiration;
+            options.RefreshTokenExpiration = settings.RefreshTokenExpiration;
+
             var certificatePath = Path.Combine(Directory.GetCurrentDirectory(), "IdentityCertificate.pfx");
             RSA? rsaPrivateKey;
-            using (X509Certificate2 signingCert = new X509Certificate2(certificatePath, appSettings.JwtSettings.IdentityCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet))
+            using (X509Certificate2 signingCert = new X509Certificate2(certificatePath, appSettings.IdentitySettings.IdentityCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet))
             {
                 rsaPrivateKey = signingCert.GetRSAPrivateKey();
             }
@@ -74,35 +74,26 @@ public static IServiceCollection AddJwt(this IServiceCollection services, IConfi
 
                 ValidateIssuer = true,
                 ValidIssuer = settings.Issuer,
+
+                AuthenticationType = IdentityConstants.BearerScheme
             };
 
-            options.Events = new JwtBearerEvents
+            options.BearerTokenProtector = new AppSecureJwtDataFormat(appSettings, validationParameters);
+
+            options.Events = new()
             {
                 OnMessageReceived = async context =>
                 {
                     // The server accepts the access_token from either the authorization header, the cookie, or the request URL query string
-
-                    var access_token = context.Request.Cookies["access_token"];
-
-                    if (string.IsNullOrEmpty(access_token))
-                    {
-                        access_token = context.Request.Query["access_token"];
-                    }
-
-                    context.Token = access_token;
+                    context.Token ??= context.Request.Cookies["access_token"] ?? context.Request.Query["access_token"];
                 }
             };
-
-            options.SaveToken = true;
-            options.TokenValidationParameters = validationParameters;
         });
 
         services.AddAuthorization();
-
-        return services;
     }
 
-    public static IServiceCollection AddSwaggerGen(this IServiceCollection services)
+    public static void AddSwaggerGen(this IServiceCollection services)
     {
         services.AddSwaggerGen(options =>
         {
@@ -111,33 +102,32 @@ public static IServiceCollection AddSwaggerGen(this IServiceCollection services)
 
             options.OperationFilter<ODataOperationFilter>();
 
-            options.AddSecurityDefinition("bearerAuth", new OpenApiSecurityScheme
+            options.AddSecurityDefinition("bearerAuth", new()
             {
                 Name = "Authorization",
-                Type = SecuritySchemeType.Http,
-                Scheme = "bearer",
-                BearerFormat = "JWT",
+                Description = "Enter the Bearer Authorization string as following: `Bearer Generated-Bearer-Token`",
                 In = ParameterLocation.Header,
-                Description = "JWT Authorization header using the Bearer scheme."
+                Type = SecuritySchemeType.ApiKey,
+                Scheme = "Bearer"
             });
 
-            options.AddSecurityRequirement(new OpenApiSecurityRequirement
+            options.AddSecurityRequirement(new()
             {
                 {
-                    new OpenApiSecurityScheme
+                    new()
                     {
+                        Name = "Bearer",
+                        In = ParameterLocation.Header,
                         Reference = new OpenApiReference
                         {
-                            Type = ReferenceType.SecurityScheme,
-                            Id = "bearerAuth"
+                            Id = "Bearer",
+                            Type = ReferenceType.SecurityScheme
                         }
                     },
-                    Array.Empty<string>()
+                    []
                 }
             });
         });
-
-        return services;
     }
 
     public static IServiceCollection AddHealthChecks(this IServiceCollection services, IWebHostEnvironment env, IConfiguration configuration)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Extensions/ODataOperationFilter.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Extensions/ODataOperationFilter.cs
index bc15442072..d13ddd59eb 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Extensions/ODataOperationFilter.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Extensions/ODataOperationFilter.cs
@@ -12,7 +12,10 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
     {
         if (operation.Parameters == null) operation.Parameters = new List<OpenApiParameter>();
 
-        var descriptor = (ControllerActionDescriptor)context.ApiDescription.ActionDescriptor;
+        var descriptor = context.ApiDescription.ActionDescriptor as ControllerActionDescriptor;
+
+        if (descriptor is null)
+            return;
 
         var odataQueryOptionsParameter = descriptor!.Parameters.SingleOrDefault(p => typeof(ODataQueryOptions).IsAssignableFrom(p.ParameterType));
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Resources/ResetPasswordTemplate.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Resources/ResetPasswordTemplate.razor
index 9c886a2fa8..c6d3008a17 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Resources/ResetPasswordTemplate.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Resources/ResetPasswordTemplate.razor
@@ -16,7 +16,7 @@
     <title>@EmailLocalizer[nameof(EmailStrings.ResetPasswordEmailSubject)]</title>
 </head>
 <body style="width:100%; height:100%; margin:0; padding:0; background-color:#FCFCFC; font-family:Arial,sans-serif;">
-<main style="padding: 6% 4%;">
+    <main style="padding: 6% 4%;">
         <table class="content-table" border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
                style="border:1px solid #EDEBE9; border-radius:2px; padding:50px; text-align:center;">
             <tr>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/ApiExceptionHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/ApiExceptionHandler.cs
index 6213c5e17c..b4734775cc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/ApiExceptionHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/ApiExceptionHandler.cs
@@ -7,6 +7,7 @@ namespace Boilerplate.Server.Api.Services;
 public partial class ApiExceptionHandler : IExceptionHandler
 {
     [AutoInject] private IWebHostEnvironment _webHostEnvironment = default!;
+    [AutoInject] private IStringLocalizer<AppStrings> _localizer = default!;
 
     public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e, CancellationToken cancellationToken)
     {
@@ -14,18 +15,17 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
         httpContext.Response.Headers.Append("Request-ID", httpContext.TraceIdentifier);
 
         var exception = UnWrapException(e);
-        var localizer = httpContext.RequestServices.GetRequiredService<IStringLocalizer<AppStrings>>();
         var knownException = exception as KnownException;
 
         // The details of all of the exceptions are returned only in dev mode. in any other modes like production, only the details of the known exceptions are returned.
         var key = knownException?.Key ?? nameof(UnknownException);
-        var message = knownException?.Message ?? (_webHostEnvironment.IsDevelopment() ? exception.Message : localizer[nameof(UnknownException)]);
+        var message = knownException?.Message ?? (_webHostEnvironment.IsDevelopment() ? exception.Message : _localizer[nameof(UnknownException)]);
 
         var statusCode = (int)(exception is RestException restExp ? restExp.StatusCode : HttpStatusCode.InternalServerError);
 
         if (exception is KnownException && message == key)
         {
-            message = localizer[message];
+            message = _localizer[message];
         }
 
         var restExceptionPayload = new RestErrorInfo
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/AppIdentityErrorDescriber.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/AppIdentityErrorDescriber.cs
new file mode 100644
index 0000000000..78abf85d9f
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/AppIdentityErrorDescriber.cs
@@ -0,0 +1,61 @@
+using System.Data;
+
+namespace Boilerplate.Server.Api.Services;
+
+public partial class AppIdentityErrorDescriber : IdentityErrorDescriber
+{
+    [AutoInject] IStringLocalizer<IdentityStrings> _localizer = default!;
+
+    IdentityError CreateIdentityError(string code, params object[] args)
+    {
+        return new()
+        {
+            Code = code,
+            Description = _localizer.GetString(code, args)
+        };
+    }
+
+    public override IdentityError ConcurrencyFailure() => CreateIdentityError(nameof(IdentityStrings.ConcurrencyFailure));
+
+    public override IdentityError DuplicateEmail(string email) => CreateIdentityError(nameof(IdentityStrings.DuplicateEmail), email);
+
+    public override IdentityError DuplicateRoleName(string role) => CreateIdentityError(nameof(IdentityStrings.DuplicateRoleName), role);
+
+    public override IdentityError DuplicateUserName(string userName) => CreateIdentityError(nameof(IdentityStrings.DuplicateUserName), userName);
+
+    public override IdentityError InvalidEmail(string? email) => CreateIdentityError(nameof(IdentityStrings.InvalidEmail), email ?? string.Empty);
+
+    public override IdentityError InvalidRoleName(string? role) => CreateIdentityError(nameof(IdentityStrings.InvalidRoleName), role ?? string.Empty);
+
+    public override IdentityError InvalidToken() => CreateIdentityError(nameof(IdentityStrings.InvalidToken));
+
+    public override IdentityError InvalidUserName(string? userName) => CreateIdentityError(nameof(IdentityStrings.InvalidUserName), userName ?? string.Empty);
+
+    public override IdentityError LoginAlreadyAssociated() => CreateIdentityError(nameof(IdentityStrings.LoginAlreadyAssociated));
+
+    public override IdentityError PasswordMismatch() => CreateIdentityError(nameof(IdentityStrings.PasswordMismatch));
+
+    public override IdentityError PasswordRequiresDigit() => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresDigit));
+
+    public override IdentityError PasswordRequiresLower() => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresLower));
+
+    public override IdentityError PasswordRequiresNonAlphanumeric() => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresNonAlphanumeric));
+
+    public override IdentityError PasswordRequiresUniqueChars(int uniqueChars) => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresUniqueChars), uniqueChars);
+
+    public override IdentityError PasswordRequiresUpper() => CreateIdentityError(nameof(IdentityStrings.PasswordRequiresUpper));
+
+    public override IdentityError PasswordTooShort(int length) => CreateIdentityError(nameof(IdentityStrings.PasswordTooShort));
+
+    public override IdentityError RecoveryCodeRedemptionFailed() => CreateIdentityError(nameof(IdentityStrings.RecoveryCodeRedemptionFailed));
+
+    public override IdentityError UserAlreadyHasPassword() => CreateIdentityError(nameof(IdentityStrings.UserAlreadyHasPassword));
+
+    public override IdentityError UserAlreadyInRole(string role) => CreateIdentityError(nameof(IdentityStrings.UserAlreadyInRole), role);
+
+    public override IdentityError UserLockoutNotEnabled() => CreateIdentityError(nameof(IdentityStrings.UserLockoutNotEnabled));
+
+    public override IdentityError UserNotInRole(string role) => CreateIdentityError(nameof(IdentityStrings.UserNotInRole), role);
+
+    public override IdentityError DefaultError() => CreateIdentityError(nameof(IdentityStrings.DefaultError));
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/AppSecureJwtDataFormat.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/AppSecureJwtDataFormat.cs
new file mode 100644
index 0000000000..cc49613866
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/AppSecureJwtDataFormat.cs
@@ -0,0 +1,56 @@
+using System.IdentityModel.Tokens.Jwt;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.IdentityModel.Tokens;
+
+namespace Boilerplate.Server.Api.Services;
+
+/// <summary>
+/// Stores bearer token in jwt format
+/// </summary>
+public class AppSecureJwtDataFormat(AppSettings appSettings, TokenValidationParameters validationParameters)
+    : ISecureDataFormat<AuthenticationTicket>
+{
+    public AuthenticationTicket? Unprotect(string? protectedText)
+        => Unprotect(protectedText, null);
+
+    public AuthenticationTicket? Unprotect(string? protectedText, string? purpose)
+    {
+        try
+        {
+            var handler = new JwtSecurityTokenHandler();
+            ClaimsPrincipal? principal = handler.ValidateToken(protectedText, validationParameters, out var validToken);
+            var validJwt = (JwtSecurityToken)validToken;
+            var data = new AuthenticationTicket(principal, properties: new AuthenticationProperties()
+            {
+                ExpiresUtc = validJwt.ValidTo
+            }, IdentityConstants.BearerScheme);
+            return data;
+        }
+        catch (Exception exp)
+        {
+            throw new UnauthorizedException(nameof(AppStrings.UnauthorizedException), exp);
+        }
+    }
+
+    public string Protect(AuthenticationTicket data) => Protect(data, null);
+
+    public string Protect(AuthenticationTicket data, string? purpose)
+    {
+        var jwtSecurityTokenHandler = new JwtSecurityTokenHandler();
+
+        var securityToken = jwtSecurityTokenHandler
+            .CreateJwtSecurityToken(new SecurityTokenDescriptor
+            {
+                Issuer = appSettings.IdentitySettings.Issuer,
+                Audience = appSettings.IdentitySettings.Audience,
+                IssuedAt = DateTime.UtcNow,
+                Expires = data.Properties.ExpiresUtc!.Value.UtcDateTime,
+                SigningCredentials = new SigningCredentials(validationParameters.IssuerSigningKey, SecurityAlgorithms.RsaSha512),
+                Subject = new ClaimsIdentity(data.Principal.Claims),
+            });
+
+        var encodedJwt = jwtSecurityTokenHandler.WriteToken(securityToken);
+
+        return encodedJwt;
+    }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/Contracts/IJwtService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/Contracts/IJwtService.cs
deleted file mode 100644
index 89971f513e..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/Contracts/IJwtService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Boilerplate.Server.Api.Models.Identity;
-using Boilerplate.Shared.Dtos.Identity;
-
-namespace Boilerplate.Server.Api.Services.Contracts;
-
-public interface IJwtService
-{
-    Task<SignInResponseDto> GenerateToken(User user);
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/Contracts/IUserInformationProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/Contracts/IUserInformationProvider.cs
deleted file mode 100644
index 09ef7d363b..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/Contracts/IUserInformationProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Boilerplate.Server.Api.Services.Contracts;
-
-public interface IUserInformationProvider
-{
-    bool IsAuthenticated();
-
-    IEnumerable<Claim> GetClaims();
-
-    ClaimsIdentity GetClaimsIdentity();
-
-    int GetUserId();
-
-    string GetUserName();
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/JwtService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/JwtService.cs
deleted file mode 100644
index d8a4707717..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/JwtService.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using Boilerplate.Server.Api.Models.Identity;
-using Boilerplate.Shared.Dtos.Identity;
-using Microsoft.IdentityModel.Tokens;
-
-namespace Boilerplate.Server.Api.Services;
-
-public partial class JwtService : IJwtService
-{
-    [AutoInject] private readonly SignInManager<User> _signInManager = default!;
-
-    [AutoInject] private readonly AppSettings _appSettings = default!;
-
-    public async Task<SignInResponseDto> GenerateToken(User user)
-    {
-        var certificatePath = Path.Combine(Directory.GetCurrentDirectory(), "IdentityCertificate.pfx");
-        RSA? rsaPrivateKey;
-        using (X509Certificate2 signingCert = new X509Certificate2(certificatePath, _appSettings.JwtSettings.IdentityCertificatePassword, OperatingSystem.IsWindows() ? X509KeyStorageFlags.EphemeralKeySet : X509KeyStorageFlags.DefaultKeySet))
-        {
-            rsaPrivateKey = signingCert.GetRSAPrivateKey();
-        }
-
-        var signingCredentials = new SigningCredentials(new RsaSecurityKey(rsaPrivateKey), SecurityAlgorithms.RsaSha512);
-
-        var claims = (await _signInManager.ClaimsFactory.CreateAsync(user)).Claims;
-
-        var jwtSecurityTokenHandler = new JwtSecurityTokenHandler();
-
-        var securityToken = jwtSecurityTokenHandler
-            .CreateJwtSecurityToken(new SecurityTokenDescriptor
-            {
-                Issuer = _appSettings.JwtSettings.Issuer,
-                Audience = _appSettings.JwtSettings.Audience,
-                IssuedAt = DateTime.UtcNow,
-                NotBefore = DateTime.UtcNow.AddMinutes(_appSettings.JwtSettings.NotBeforeMinutes),
-                Expires = DateTime.UtcNow.AddMinutes(_appSettings.JwtSettings.ExpirationMinutes),
-                SigningCredentials = signingCredentials,
-                Subject = new ClaimsIdentity(claims)
-            });
-
-        return new SignInResponseDto
-        {
-            AccessToken = jwtSecurityTokenHandler.WriteToken(securityToken),
-            ExpiresIn = (long)TimeSpan.FromMinutes(_appSettings.JwtSettings.ExpirationMinutes).TotalSeconds
-        };
-    }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/UserInformationProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/UserInformationProvider.cs
deleted file mode 100644
index 9dad970c27..0000000000
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Services/UserInformationProvider.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-namespace Boilerplate.Server.Api.Services;
-
-public partial class UserInformationProvider : IUserInformationProvider
-{
-    [AutoInject]
-    public IHttpContextAccessor _httpContextAccessor = default!;
-
-    public IEnumerable<Claim> GetClaims()
-    {
-        if (IsAuthenticated() is false)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return GetClaimsIdentity().Claims;
-    }
-
-    public ClaimsIdentity GetClaimsIdentity()
-    {
-        if (IsAuthenticated() is false)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return (ClaimsIdentity)_httpContextAccessor.HttpContext!.User.Identity!;
-    }
-
-    public int GetUserId()
-    {
-        if (IsAuthenticated() is false)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return _httpContextAccessor.HttpContext!.User.GetUserId();
-    }
-
-    public string GetUserName()
-    {
-        if (IsAuthenticated() is false)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return _httpContextAccessor.HttpContext!.User.GetUserName();
-    }
-
-    public bool IsAuthenticated()
-    {
-        if (_httpContextAccessor.HttpContext is null)
-        {
-            throw new InvalidOperationException();
-        }
-
-        return _httpContextAccessor.HttpContext.User?.Identity?.IsAuthenticated is true;
-    }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Startup/Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Startup/Services.cs
index 8da1c962f5..872f953b0d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Startup/Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/Startup/Services.cs
@@ -12,6 +12,7 @@
 using Boilerplate.Client.Web.Services;
 using Boilerplate.Client.Core.Services;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.WebAssembly.Services;
 using Microsoft.JSInterop;
 #endif
 
@@ -27,7 +28,6 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.AddSharedServices();
 
-        services.AddScoped<IUserInformationProvider, UserInformationProvider>();
         services.AddExceptionHandler<ApiExceptionHandler>();
 
 #if BlazorWebAssembly
@@ -35,32 +35,22 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
         services.AddClientSharedServices();
         services.AddClientWebServices();
 
-        // In the Pre-Rendering mode, the configured HttpClient will use the access_token provided by the cookie in the request, so the pre-rendered content would be fitting for the current user.
-        services.AddHttpClient("WebAssemblyPreRenderingHttpClient")
-            .AddHttpMessageHandler(sp => new LocalizationDelegatingHandler())
-            .AddHttpMessageHandler(sp => new AuthDelegatingHandler(sp.GetRequiredService<IAuthTokenProvider>(), sp.GetRequiredService<IJSRuntime>()))
-            .AddHttpMessageHandler(sp => new RetryDelegatingHandler())
-            .AddHttpMessageHandler(sp => new ExceptionDelegatingHandler())
-            .ConfigurePrimaryHttpMessageHandler<HttpClientHandler>()
-            .ConfigureHttpClient((sp, httpClient) =>
+        services.AddTransient(sp =>
+        {
+            Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
+
+            if (apiServerAddress!.IsAbsoluteUri is false)
             {
-                Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
-                if (apiServerAddress!.IsAbsoluteUri is false)
-                {
-                    apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
-                }
-                httpClient.BaseAddress = apiServerAddress;
-            });
+                apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
+            }
 
-        services.AddScoped(sp =>
-        {
-            IHttpClientFactory httpClientFactory = sp.GetRequiredService<IHttpClientFactory>();
-            return httpClientFactory.CreateClient("WebAssemblyPreRenderingHttpClient");
-            // this is for pre rendering of blazor client/wasm
-            // for other usages of http client, for example calling 3rd party apis, either use services.AddHttpClient("NamedHttpClient") or services.AddHttpClient<TypedHttpClient>();
+            return new HttpClient(sp.GetRequiredService<RequestHeadersDelegationHandler>())
+            {
+                BaseAddress = apiServerAddress
+            };
         });
 
-        services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();
+        services.AddTransient<LazyAssemblyLoader>();
         services.AddRazorPages();
 #endif
 
@@ -121,7 +111,7 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.Configure<AppSettings>(configuration.GetSection(nameof(AppSettings)));
 
-        services.AddScoped(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
+        services.AddTransient(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
 
         services.AddEndpointsApiExplorer();
 
@@ -129,11 +119,9 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.AddIdentity(configuration);
 
-        services.AddJwt(configuration);
-
         services.AddHealthChecks(env, configuration);
 
-        services.AddScoped<HtmlRenderer>();
+        services.AddTransient<HtmlRenderer>();
 
         var fluentEmailServiceBuilder = services.AddFluentEmail(appSettings.EmailSettings.DefaultFromEmail, appSettings.EmailSettings.DefaultFromName);
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/appsettings.json
index 7395ca1fbe..42c9abe393 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/appsettings.json
@@ -14,22 +14,20 @@
         }
     },
     "AppSettings": {
-        "JwtSettings": {
-            "IdentityCertificatePassword": "P@ssw0rdP@ssw0rd",
+        "IdentitySettings": {
             "Issuer": "Boilerplate",
             "Audience": "Boilerplate",
-            "NotBeforeMinutes": "0",
-            "ExpirationMinutes": "1440"
-        },
-        "IdentitySettings": {
+            "IdentityCertificatePassword": "P@ssw0rdP@ssw0rd",
+            "BearerTokenExpiration": "0.01:00:00", //Format: D.HH:mm:ss
+            "RefreshTokenExpiration": "14.00:00:00", //Format: D.HH:mm:ss
             "PasswordRequireDigit": "false",
             "PasswordRequiredLength": "6",
             "PasswordRequireNonAlphanumeric": "false",
             "PasswordRequireUppercase": "false",
             "PasswordRequireLowercase": "false",
             "RequireUniqueEmail": "true",
-            "ConfirmationEmailResendDelay": "0.00:02:00", //Format: D.HH:mm:nn
-            "ResetPasswordEmailResendDelay": "0.00:02:00" //Format: D.HH:mm:nn
+            "ConfirmationEmailResendDelay": "0.00:02:00", //Format: D.HH:mm:ss
+            "ResetPasswordEmailResendDelay": "0.00:02:00" //Format: D.HH:mm:ss
         },
         "EmailSettings": {
             "Host": "LocalFolder", // Local folder means storing emails as .eml file in bin/Debug/net8.0/sent-emails folder (Recommended for testing purposes only) instead of sending them using smtp server.
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/wwwroot/swagger/swagger-utils.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/wwwroot/swagger/swagger-utils.js
index 358dfc0fc9..37cbc39477 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/wwwroot/swagger/swagger-utils.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Api/wwwroot/swagger/swagger-utils.js
@@ -104,6 +104,7 @@ const createLoginUI = function (swagger, rootDiv) {
 
     const userNameInput = document.createElement("input");
     userNameInput.type = "text";
+    userNameInput.placeholder = "test@bitplatform.dev";
     userNameInput.style = "margin-left: 10px; margin-right: 10px;";
     userNameLabel.appendChild(userNameInput);
 
@@ -116,6 +117,7 @@ const createLoginUI = function (swagger, rootDiv) {
     passwordLabel.appendChild(passwordSpan);
 
     const passwordInput = document.createElement("input");
+    passwordInput.placeholder = "123456";
     passwordInput.type = "password";
     passwordInput.style = "margin-left: 10px; margin-right: 10px;";
     passwordLabel.appendChild(passwordInput);
@@ -145,24 +147,24 @@ const createLoginUI = function (swagger, rootDiv) {
 }
 
 const login = async (swagger, userName, password) => {
-    const response = await fetch('/api/Auth/SignIn', {
+    const response = await fetch('/api/Identity/SignIn', {
         headers: { "Content-Type": "application/json; charset=utf-8" },
         method: 'POST',
         body: JSON.stringify({ "userName": userName, "password": password })
     })
     if (response.ok) {
         const result = await response.json();
-        const accessToken = result.accessToken;
+        const access_token = result.accessToken;
         accessTokenExpiresIn = result.expiresIn;
 
-        const authorizationObject = getAuthorizationRequestObject(accessToken);
+        const authorizationObject = getAuthorizationRequestObject(access_token);
         swagger.authActions.authorize(authorizationObject);
     } else {
         alert(await response.text())
     }
 }
 
-const getAuthorizationRequestObject = (accessToken) => {
+const getAuthorizationRequestObject = (access_token) => {
     return {
         "bearerAuth": {
             "name": "Bearer",
@@ -172,7 +174,7 @@ const getAuthorizationRequestObject = (accessToken) => {
                 "name": "Authorization",
                 "in": "header"
             },
-            value: accessToken
+            value: access_token
         },
     };
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs
index c6cfc31a45..30f4e50d79 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs
@@ -32,7 +32,8 @@ namespace Boilerplate.Shared.Dtos;
 [JsonSerializable(typeof(PagedResult<CategoryDto>))]
 //#endif
 [JsonSerializable(typeof(SignInRequestDto))]
-[JsonSerializable(typeof(SignInResponseDto))]
+[JsonSerializable(typeof(TokenResponseDto))]
+[JsonSerializable(typeof(RefreshRequestDto))]
 [JsonSerializable(typeof(SignUpRequestDto))]
 [JsonSerializable(typeof(EditUserDto))]
 [JsonSerializable(typeof(RestErrorInfo))]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/RefreshRequestDto.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/RefreshRequestDto.cs
new file mode 100644
index 0000000000..44392762bb
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/RefreshRequestDto.cs
@@ -0,0 +1,8 @@
+namespace Boilerplate.Shared.Dtos.Identity;
+
+[DtoResourceType(typeof(AppStrings))]
+public class RefreshRequestDto
+{
+    [Required(ErrorMessage = nameof(AppStrings.RequiredAttribute_ValidationError))]
+    public string? RefreshToken { get; set; }
+}
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/SignInRequestDto.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/SignInRequestDto.cs
index 7e76709465..4f4da728ee 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/SignInRequestDto.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/SignInRequestDto.cs
@@ -4,7 +4,7 @@ namespace Boilerplate.Shared.Dtos.Identity;
 [DtoResourceType(typeof(AppStrings))]
 public class SignInRequestDto
 {
-    /// <example>me@gmail.com</example>
+    /// <example>test@bitplatform.dev</example>
     [Required(ErrorMessage = nameof(AppStrings.RequiredAttribute_ValidationError))]
     [EmailAddress(ErrorMessage = nameof(AppStrings.EmailAddressAttribute_ValidationError))]
     [Display(Name = nameof(AppStrings.Email))]
@@ -14,4 +14,8 @@ public class SignInRequestDto
     [Required(ErrorMessage = nameof(AppStrings.RequiredAttribute_ValidationError))]
     [Display(Name = nameof(AppStrings.Password))]
     public string? Password { get; set; }
+
+    [NotMapped]
+    [Display(Name = nameof(AppStrings.RememberMe))]
+    public bool RememberMe { get; set; } = true;
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/SignInResponseDto.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/TokenDto.cs
similarity index 58%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/SignInResponseDto.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/TokenDto.cs
index 82f2cf24ac..1b14a9a485 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/SignInResponseDto.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Identity/TokenDto.cs
@@ -2,9 +2,13 @@
 namespace Boilerplate.Shared.Dtos.Identity;
 
 [DtoResourceType(typeof(AppStrings))]
-public class SignInResponseDto
+public class TokenResponseDto
 {
+    public string? TokenType { get; set; }
+
     public string? AccessToken { get; set; }
 
     public long ExpiresIn { get; set; }
-}
+
+    public string? RefreshToken { get; set; }
+}
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/PagedResultDto.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/PagedResultDto.cs
index d4706179ce..0bdaae6a7d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/PagedResultDto.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/PagedResultDto.cs
@@ -2,11 +2,11 @@
 
 public class PagedResult<T>
 {
-    public IList<T>? Items { get; set; }
+    public IAsyncEnumerable<T>? Items { get; set; }
 
     public long TotalCount { get; set; }
 
-    public PagedResult(IList<T> items, long totalCount)
+    public PagedResult(IAsyncEnumerable<T> items, long totalCount)
     {
         Items = items;
         TotalCount = totalCount;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/ClaimsPrincipalExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/ClaimsPrincipalExtensions.cs
index 9929bc0776..e388403108 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/ClaimsPrincipalExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/ClaimsPrincipalExtensions.cs
@@ -4,11 +4,16 @@ public static class ClaimsPrincipalExtensions
 {
     public static int GetUserId(this ClaimsPrincipal claimsPrincipal)
     {
-        return int.Parse(claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)!.Value);
+        return int.Parse((claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier) ?? claimsPrincipal.FindFirst("nameid"))!.Value);
     }
 
     public static string GetUserName(this ClaimsPrincipal claimsPrincipal)
     {
-        return claimsPrincipal.FindFirst(ClaimTypes.Name)!.Value;
+        return (claimsPrincipal.FindFirst(ClaimTypes.Name) ?? claimsPrincipal.FindFirst("unique_name"))!.Value;
+    }
+    
+    public static bool IsAuthenticated(this ClaimsPrincipal? claimsPrincipal)
+    {
+        return claimsPrincipal?.Identity?.IsAuthenticated is true;
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/IServiceCollectionExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/IServiceCollectionExtensions.cs
index 8cd50b98de..353cf4e361 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/IServiceCollectionExtensions.cs
@@ -8,7 +8,7 @@ public static IServiceCollection AddSharedServices(this IServiceCollection servi
     {
         // Services being registered here can get injected everywhere (Api, Web, Android, iOS, Windows, macOS and Linux)
 
-        services.AddSingleton<IDateTimeProvider, DateTimeProvider>();
+        services.AddTransient<IDateTimeProvider, DateTimeProvider>();
 
         services.AddAuthorizationCore();
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Mapper.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Mapper.cs
index 9fa99de911..50992d64bd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Mapper.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Mapper.cs
@@ -2,9 +2,6 @@
 using Boilerplate.Shared.Dtos.Identity;
 //#if (sample == "Todo")
 using Boilerplate.Shared.Dtos.Todo;
-//#elif (sample == "AdminPanel")
-using Boilerplate.Shared.Dtos.Categories;
-using Boilerplate.Shared.Dtos.Products;
 //#endif
 using Riok.Mapperly.Abstractions;
 
@@ -24,9 +21,6 @@ public static partial class Mapper
 {
     //#if (sample == "Todo")
     public static partial void Patch(this TodoItemDto source, TodoItemDto destination);
-    //#elif (sample == "AdminPanel")
-    public static partial void Patch(this CategoryDto source, CategoryDto destination);
-    public static partial void Patch(this ProductDto source, ProductDto destination);
     //#endif
     public static partial void Patch(this UserDto source, UserDto destination);
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.Designer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.Designer.cs
index ab53c3d15e..e70db17512 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.Designer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.Designer.cs
@@ -674,7 +674,7 @@ public static string HomeMessage {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Boilerplate Home.
+        ///   Looks up a localized string similar to BlazorWeb Home.
         /// </summary>
         public static string HomeTitle {
             get {
@@ -943,6 +943,15 @@ public static string RangeAttribute_ValidationError {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Remember me?.
+        /// </summary>
+        public static string RememberMe {
+            get {
+                return ResourceManager.GetString("RememberMe", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Remove.
         /// </summary>
@@ -1150,15 +1159,6 @@ public static string Submit {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Term.
-        /// </summary>
-        public static string Term {
-            get {
-                return ResourceManager.GetString("Term", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Is accept terms?.
         /// </summary>
@@ -1304,7 +1304,7 @@ public static string UserImageCouldNotBeFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to User is locked out..
+        ///   Looks up a localized string similar to User is locked out. Try again in {0}.
         /// </summary>
         public static string UserLockedOut {
             get {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fr.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fr.resx
index dc01dce20e..1d5fb83607 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fr.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fr.resx
@@ -139,7 +139,7 @@
     <value>L'e-mail « {0} » est déjà pris.</value>
   </data>
   <data name="UserLockedOut" xml:space="preserve">
-    <value>L'utilisateur est verrouillé.</value>
+    <value>L'utilisateur est verrouillé. Réessayez dans {0}</value>
   </data>
   <data name="UserNameNotFound" xml:space="preserve">
     <value>L'utilisateur {0} n'existe pas.</value>
@@ -423,9 +423,6 @@
   <data name="Submit" xml:space="preserve">
     <value>Soumettre</value>
   </data>
-  <data name="Term" xml:space="preserve">
-    <value>Terme</value>
-  </data>
   <data name="TermsMessage" xml:space="preserve">
     <value>je suis d'accord avec le</value>
   </data>
@@ -552,7 +549,10 @@
   <data name="EditProduct" xml:space="preserve">
     <value>Modifier le produit</value>
   </data>
-    <data name="Dashboard" xml:space="preserve">
+  <data name="Dashboard" xml:space="preserve">
     <value>Tableau de bord</value>
   </data>
+  <data name="RememberMe" xml:space="preserve">
+    <value>Souviens-toi de moi?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
index 320971d835..e60d28f943 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- +:cnd:noEmit -->
 <root>
-    <!-- 
+  <!-- 
     Microsoft ResX Schema 
     
     Version 2.0
@@ -60,507 +60,507 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string" />
-                            <xsd:attribute name="type" type="xsd:string" />
-                            <xsd:attribute name="mimetype" type="xsd:string" />
-                            <xsd:attribute ref="xml:space" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string" />
-                            <xsd:attribute name="name" type="xsd:string" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-                            <xsd:attribute ref="xml:space" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" />
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <!-- .NET Validation messages -->
-    <data name="CompareAttribute_ValidationError" xml:space="preserve">
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <!-- .NET Validation messages -->
+  <data name="CompareAttribute_ValidationError" xml:space="preserve">
     <value>'{0}' and '{1}' do not match.</value>
   </data>
-    <data name="EmailAddressAttribute_ValidationError" xml:space="preserve">
+  <data name="EmailAddressAttribute_ValidationError" xml:space="preserve">
     <value>The {0} field is not a valid e-mail address.</value>
   </data>
-    <data name="MaxLengthAttribute_InvalidMaxLength" xml:space="preserve">
+  <data name="MaxLengthAttribute_InvalidMaxLength" xml:space="preserve">
     <value>MaxLengthAttribute must have a Length value that is greater than zero. Use MaxLength() without parameters to indicate that the string or array can have the maximum allowable length.</value>
   </data>
-    <data name="MinLengthAttribute_ValidationError" xml:space="preserve">
+  <data name="MinLengthAttribute_ValidationError" xml:space="preserve">
     <value>The field {0} must be a string or array type with a minimum length of '{1}'.</value>
   </data>
-    <data name="RangeAttribute_ValidationError" xml:space="preserve">
+  <data name="RangeAttribute_ValidationError" xml:space="preserve">
     <value>The field {0} must be between {1} and {2}.</value>
   </data>
-    <data name="RequiredAttribute_ValidationError" xml:space="preserve">
+  <data name="RequiredAttribute_ValidationError" xml:space="preserve">
     <value>The {0} field is required.</value>
   </data>
-    <!-- Exceptions -->
-    <data name="BadRequestException" xml:space="preserve">
+  <!-- Exceptions -->
+  <data name="BadRequestException" xml:space="preserve">
     <value>Invalid request</value>
   </data>
-    <data name="ConflicException" xml:space="preserve">
+  <data name="ConflicException" xml:space="preserve">
     <value>Request could not be processed because of conflict in the request</value>
   </data>
-    <data name="ForbiddenException" xml:space="preserve">
+  <data name="ForbiddenException" xml:space="preserve">
     <value>Access to the requested resource is forbidden</value>
   </data>
-    <data name="ResourceValidationException" xml:space="preserve">
+  <data name="ResourceValidationException" xml:space="preserve">
     <value>Request data is not valid</value>
   </data>
-    <data name="RestException" xml:space="preserve">
+  <data name="RestException" xml:space="preserve">
     <value>An error occurred while communicating with server</value>
   </data>
-    <data name="UnauthorizedException" xml:space="preserve">
+  <data name="UnauthorizedException" xml:space="preserve">
     <value>Your request lacks valid authentication credentials</value>
   </data>
-    <data name="UnknownException" xml:space="preserve">
+  <data name="UnknownException" xml:space="preserve">
     <value>Unknown error has occurred</value>
   </data>
-    <data name="UpdateConcurrencyException" xml:space="preserve">
+  <data name="UpdateConcurrencyException" xml:space="preserve">
     <value>The record was modified by another user after you got the original data. the operation was canceled.</value>
   </data>
-    <data name="ResourceNotFoundException" xml:space="preserve">
+  <data name="ResourceNotFoundException" xml:space="preserve">
     <value>Resource not found</value>
   </data>
-    <data name="TooManyRequestsExceptions" xml:space="preserve">
+  <data name="TooManyRequestsExceptions" xml:space="preserve">
     <value>Too many requests</value>
   </data>
-    <data name="ServerConnectionException" xml:space="preserve">
+  <data name="ServerConnectionException" xml:space="preserve">
     <value>Unable to connect to server.</value>
   </data>
-    <!-- Boilerplate strings -->
-    <data name="Active" xml:space="preserve">
+  <!-- Boilerplate strings -->
+  <data name="Active" xml:space="preserve">
     <value>Active</value>
   </data>
-    <data name="All" xml:space="preserve">
+  <data name="All" xml:space="preserve">
     <value>All</value>
   </data>
-    <data name="Alphabetical" xml:space="preserve">
+  <data name="Alphabetical" xml:space="preserve">
     <value>Alphabetical</value>
   </data>
-    <data name="Completed" xml:space="preserve">
+  <data name="Completed" xml:space="preserve">
     <value>Completed</value>
   </data>
-    <data name="Date" xml:space="preserve">
+  <data name="Date" xml:space="preserve">
     <value>Date</value>
   </data>
-    <data name="EditProfileTitle" xml:space="preserve">
+  <data name="EditProfileTitle" xml:space="preserve">
     <value>Edit profile</value>
   </data>
-    <data name="FullName" xml:space="preserve">
+  <data name="FullName" xml:space="preserve">
     <value>FullName</value>
   </data>
-    <data name="TermsTitle" xml:space="preserve">
+  <data name="TermsTitle" xml:space="preserve">
     <value>Terms</value>
   </data>
-    <data name="ProfileUpdatedSuccessfullyMessage" xml:space="preserve">
+  <data name="ProfileUpdatedSuccessfullyMessage" xml:space="preserve">
     <value>Profile updated successfully.</value>
   </data>
-    <data name="ConfirmNewPassword" xml:space="preserve">
+  <data name="ConfirmNewPassword" xml:space="preserve">
     <value>Confirm New Password</value>
   </data>
-    <data name="Email" xml:space="preserve">
+  <data name="Email" xml:space="preserve">
     <value>Email</value>
   </data>
-    <data name="Password" xml:space="preserve">
+  <data name="Password" xml:space="preserve">
     <value>Password</value>
   </data>
-    <data name="PasswordChangedSuccessfullyMessage" xml:space="preserve">
+  <data name="PasswordChangedSuccessfullyMessage" xml:space="preserve">
     <value>Your password changed successfully.</value>
   </data>
-    <data name="ResendConfirmationLinkMessage" xml:space="preserve">
+  <data name="ResendConfirmationLinkMessage" xml:space="preserve">
     <value>The confirmation link has been re-sent to your email address.</value>
   </data>
-    <data name="ResetPasswordLinkSentMessage" xml:space="preserve">
+  <data name="ResetPasswordLinkSentMessage" xml:space="preserve">
     <value>The reset password link has been sent to your email address.</value>
   </data>
-    <data name="UserImageCouldNotBeFound" xml:space="preserve">
+  <data name="UserImageCouldNotBeFound" xml:space="preserve">
     <value>User image could not be found</value>
   </data>
-    <data name="Error" xml:space="preserve">
+  <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
-    <data name="WaitForResetPasswordEmailResendDelay" xml:space="preserve">
+  <data name="WaitForResetPasswordEmailResendDelay" xml:space="preserve">
     <value>You have already requested the reset password email. Try again in {0}</value>
   </data>
-    <data name="TermsAccepted" xml:space="preserve">
+  <data name="TermsAccepted" xml:space="preserve">
     <value>Is accept terms?</value>
   </data>
-    <data name="YouHaveToAcceptTerms" xml:space="preserve">
+  <data name="YouHaveToAcceptTerms" xml:space="preserve">
     <value>You must agree to our terms.</value>
   </data>
-    <data name="Gender" xml:space="preserve">
+  <data name="Gender" xml:space="preserve">
     <value>Gender</value>
   </data>
-    <data name="BirthDate" xml:space="preserve">
+  <data name="BirthDate" xml:space="preserve">
     <value>Birthdate</value>
   </data>
-    <data name="Name" xml:space="preserve">
+  <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
-    <data name="Description" xml:space="preserve">
+  <data name="Description" xml:space="preserve">
     <value>Description</value>
   </data>
-    <data name="Price" xml:space="preserve">
+  <data name="Price" xml:space="preserve">
     <value>Price</value>
   </data>
-    <data name="YouNeedToSignIn" xml:space="preserve">
+  <data name="YouNeedToSignIn" xml:space="preserve">
     <value>You must be signed in to continue.</value>
   </data>
-    <data name="InvalidUsernameOrPassword" xml:space="preserve">
+  <data name="InvalidUsernameOrPassword" xml:space="preserve">
     <value>Invalid username or password</value>
   </data>
-    <data name="WaitForConfirmationEmailResendDelay" xml:space="preserve">
+  <data name="WaitForConfirmationEmailResendDelay" xml:space="preserve">
     <value>You have already requested the confirmation email. Try again in {0}</value>
   </data>
-    <data name="EmailAlreadyConfirmed" xml:space="preserve">
+  <data name="EmailAlreadyConfirmed" xml:space="preserve">
     <value>Your email is already confirmed.</value>
   </data>
-    <data name="Title" xml:space="preserve">
+  <data name="Title" xml:space="preserve">
     <value>Title</value>
   </data>
-    <data name="AreYouSureWannaDelete" xml:space="preserve">
+  <data name="AreYouSureWannaDelete" xml:space="preserve">
     <value>Are you sure you want to delete {0}</value>
   </data>
-    <data name="Home" xml:space="preserve">
+  <data name="Home" xml:space="preserve">
     <value>Home</value>
   </data>
-    <data name="UserLockedOut" xml:space="preserve">
-      <value>User is locked out.</value>
+  <data name="UserLockedOut" xml:space="preserve">
+      <value>User is locked out. Try again in {0}</value>
     </data>
-    <data name="UserNameNotFound" xml:space="preserve">
+  <data name="UserNameNotFound" xml:space="preserve">
       <value>User {0} does not exist.</value>
     </data>
-    <data name="DuplicateEmail" xml:space="preserve">
+  <data name="DuplicateEmail" xml:space="preserve">
       <value>Email '{0}' is already taken.</value>
     </data>
-    <data name="Add" xml:space="preserve">
+  <data name="Add" xml:space="preserve">
     <value>Add</value>
   </data>
-    <data name="AlreadyHaveAccountMessage" xml:space="preserve">
+  <data name="AlreadyHaveAccountMessage" xml:space="preserve">
     <value>Already have an account?</value>
   </data>
-    <data name="ConfirmEmailMessage" xml:space="preserve">
+  <data name="ConfirmEmailMessage" xml:space="preserve">
     <value>We have sent a confirmation link to your email address.
 Please confirm your email by clicking on the link.</value>
   </data>
-    <data name="ConfirmEmailTitle" xml:space="preserve">
+  <data name="ConfirmEmailTitle" xml:space="preserve">
     <value>Confirm Your Email Address</value>
   </data>
-    <data name="DeleteAccount" xml:space="preserve">
+  <data name="DeleteAccount" xml:space="preserve">
     <value>Delete Account</value>
   </data>
-    <data name="DeleteAccountPrompt" xml:space="preserve">
+  <data name="DeleteAccountPrompt" xml:space="preserve">
     <value>Are you sure you want to delete your account?</value>
   </data>
-    <data name="DontHaveAccountMessage" xml:space="preserve">
+  <data name="DontHaveAccountMessage" xml:space="preserve">
     <value>Don’t have an account?</value>
   </data>
-    <data name="Edit" xml:space="preserve">
+  <data name="Edit" xml:space="preserve">
     <value>Edit</value>
   </data>
-    <data name="EmailConfirmationFailedMessage" xml:space="preserve">
+  <data name="EmailConfirmationFailedMessage" xml:space="preserve">
     <value>Email Confirmation Failed!</value>
   </data>
-    <data name="EmailConfirmationTitle" xml:space="preserve">
+  <data name="EmailConfirmationTitle" xml:space="preserve">
     <value>Email Confirmation</value>
   </data>
-    <data name="EmailConfirmedSuccessfullyMessage" xml:space="preserve">
+  <data name="EmailConfirmedSuccessfullyMessage" xml:space="preserve">
     <value>Email Confirmed Successfully!</value>
   </data>
-    <data name="FileUploadFailed" xml:space="preserve">
+  <data name="FileUploadFailed" xml:space="preserve">
     <value>An error occurred while uploading file</value>
   </data>
-    <data name="ForgetPasswordMessage" xml:space="preserve">
+  <data name="ForgetPasswordMessage" xml:space="preserve">
     <value>Please enter the email address you have been signed up with so we can send a reset password link to your email address.</value>
   </data>
-    <data name="ForgetPasswordTitle" xml:space="preserve">
+  <data name="ForgetPasswordTitle" xml:space="preserve">
     <value>Forget password</value>
   </data>
-    <data name="GenderMale" xml:space="preserve">
+  <data name="GenderMale" xml:space="preserve">
     <value>Male</value>
   </data>
-    <data name="GenderOther" xml:space="preserve">
+  <data name="GenderOther" xml:space="preserve">
     <value>Other</value>
   </data>
-    <data name="GitHubRepo" xml:space="preserve">
+  <data name="GitHubRepo" xml:space="preserve">
     <value>GitHub Repo</value>
   </data>
-    <data name="GoToToday" xml:space="preserve">
+  <data name="GoToToday" xml:space="preserve">
     <value>Go to today</value>
   </data>
-    <data name="HomeMessage" xml:space="preserve">
+  <data name="HomeMessage" xml:space="preserve">
     <value>Create your multi-mode (WASM, Server, Hybrid, pre-rendering) Blazor app easily in the shortest time ever!</value>
   </data>
-    <data name="HomeTitle" xml:space="preserve">
+  <data name="HomeTitle" xml:space="preserve">
     <value>Boilerplate Home</value>
   </data>
-    <data name="InvalidConfirmationLinkMessage" xml:space="preserve">
+  <data name="InvalidConfirmationLinkMessage" xml:space="preserve">
     <value>Looks like the confirmation link either is invalid or has expired.</value>
   </data>
-    <data name="NewPassword" xml:space="preserve">
+  <data name="NewPassword" xml:space="preserve">
     <value>New Password</value>
   </data>
-    <data name="No" xml:space="preserve">
+  <data name="No" xml:space="preserve">
     <value>No</value>
   </data>
-    <data name="NotReceivedConfirmationEmailMessage" xml:space="preserve">
+  <data name="NotReceivedConfirmationEmailMessage" xml:space="preserve">
     <value>Haven’t you received the confirmation email?</value>
   </data>
-    <data name="Or" xml:space="preserve">
+  <data name="Or" xml:space="preserve">
     <value>OR</value>
   </data>
-    <data name="ProfileImage" xml:space="preserve">
+  <data name="ProfileImage" xml:space="preserve">
     <value>Profile Image</value>
   </data>
-    <data name="Remove" xml:space="preserve">
+  <data name="Remove" xml:space="preserve">
     <value>Remove</value>
   </data>
-    <data name="ResendEmail" xml:space="preserve">
+  <data name="ResendEmail" xml:space="preserve">
     <value>Resend email</value>
   </data>
-    <data name="ResetPasswordTitle" xml:space="preserve">
+  <data name="ResetPasswordTitle" xml:space="preserve">
     <value>Reset password</value>
   </data>
-    <data name="Save" xml:space="preserve">
+  <data name="Save" xml:space="preserve">
     <value>Save</value>
   </data>
-    <data name="SignInTitle" xml:space="preserve">
+  <data name="SignInTitle" xml:space="preserve">
     <value>Sign in</value>
   </data>
-    <data name="SignOut" xml:space="preserve">
+  <data name="SignOut" xml:space="preserve">
     <value>Sign out</value>
   </data>
-    <data name="SignOutPrompt" xml:space="preserve">
+  <data name="SignOutPrompt" xml:space="preserve">
     <value>Are you sure you want to Sign out?</value>
   </data>
-    <data name="SignUp" xml:space="preserve">
+  <data name="SignUp" xml:space="preserve">
     <value>Sign up</value>
   </data>
-    <data name="SingUpTitle" xml:space="preserve">
+  <data name="SingUpTitle" xml:space="preserve">
     <value>Sign up</value>
   </data>
-    <data name="Submit" xml:space="preserve">
+  <data name="Submit" xml:space="preserve">
     <value>Submit</value>
   </data>
-    <data name="Term" xml:space="preserve">
-    <value>Term</value>
-  </data>
-    <data name="TermsMessage" xml:space="preserve">
+  <data name="TermsMessage" xml:space="preserve">
     <value>I agree to the</value>
   </data>
-    <data name="UploadNewProfileImage" xml:space="preserve">
+  <data name="UploadNewProfileImage" xml:space="preserve">
     <value>Upload a new profile image</value>
   </data>
-    <data name="Yes" xml:space="preserve">
+  <data name="Yes" xml:space="preserve">
     <value>Yes</value>
   </data>
-    <data name="SelectBirthDate" xml:space="preserve">
+  <data name="SelectBirthDate" xml:space="preserve">
     <value>Select your birth date</value>
   </data>
-    <data name="ResetPassword" xml:space="preserve">
+  <data name="ResetPassword" xml:space="preserve">
     <value>Reset password</value>
   </data>
-    <data name="Action" xml:space="preserve">
+  <data name="Action" xml:space="preserve">
     <value>Action</value>
   </data>
-    <data name="Back" xml:space="preserve">
+  <data name="Back" xml:space="preserve">
     <value>Back</value>
   </data>
-    <data name="Cancel" xml:space="preserve">
+  <data name="Cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
-    <data name="CheckSpamMailMessage" xml:space="preserve">
+  <data name="CheckSpamMailMessage" xml:space="preserve">
     <value>Check your Spam/Junk, if you could not find it in the Inbox.</value>
   </data>
-    <data name="Color" xml:space="preserve">
+  <data name="Color" xml:space="preserve">
     <value>Color</value>
   </data>
-    <data name="CustomColor" xml:space="preserve">
+  <data name="CustomColor" xml:space="preserve">
     <value>Custom color</value>
   </data>
-    <data name="Delete" xml:space="preserve">
+  <data name="Delete" xml:space="preserve">
     <value>Delete</value>
   </data>
-    <data name="Id" xml:space="preserve">
+  <data name="Id" xml:space="preserve">
     <value>Id</value>
   </data>
-    <data name="SignIn" xml:space="preserve">
+  <data name="SignIn" xml:space="preserve">
     <value>Sign in</value>
   </data>
-    <data name="SignInAsDifferentUser" xml:space="preserve">
+  <data name="SignInAsDifferentUser" xml:space="preserve">
     <value>Sign in as different user</value>
   </data>
-    <data name="YouAreSignInAs" xml:space="preserve">
+  <data name="YouAreSignInAs" xml:space="preserve">
     <value>You're sign in as</value>
   </data>
-    <data name="ForgotPasswordLink" xml:space="preserve">
+  <data name="ForgotPasswordLink" xml:space="preserve">
     <value>Forgot password?</value>
   </data>
-    <data name="GenderFemale" xml:space="preserve">
+  <data name="GenderFemale" xml:space="preserve">
     <value>Female</value>
   </data>
-    <!--#if (sample == "Todo") -->
-    <data name="TodoAddPlaceholder" xml:space="preserve">
+  <data name="RememberMe" xml:space="preserve">
+    <value>Remember me?</value>
+  </data>
+  <!--#if (sample == "Todo") -->
+  <data name="TodoAddPlaceholder" xml:space="preserve">
     <value>Add a todo</value>
   </data>
-    <data name="NoTodos" xml:space="preserve">
+  <data name="NoTodos" xml:space="preserve">
     <value>No todos yet</value>
   </data>
-    <data name="TodoSearchPlaceholder" xml:space="preserve">
+  <data name="TodoSearchPlaceholder" xml:space="preserve">
     <value>Search some todo...</value>
   </data>
-    <data name="ToDoItemCouldNotBeFound" xml:space="preserve">
+  <data name="ToDoItemCouldNotBeFound" xml:space="preserve">
     <value>Todo item could not be found</value>
   </data>
-    <data name="TodoTitle" xml:space="preserve">
+  <data name="TodoTitle" xml:space="preserve">
     <value>Todo</value>
   </data>
-    <data name="DeleteTodoItem" xml:space="preserve">
+  <data name="DeleteTodoItem" xml:space="preserve">
     <value>Delete todo item</value>
   </data>
-    <!--#elif (sample == "AdminPanel") -->
-    <data name="Last30DaysProductCount" xml:space="preserve">
+  <!--#elif (sample == "AdminPanel") -->
+  <data name="Last30DaysProductCount" xml:space="preserve">
     <value>Last 30 days product count</value>
   </data>
-    <data name="AddProduct" xml:space="preserve">
+  <data name="AddProduct" xml:space="preserve">
     <value>Add product</value>
   </data>
-    <data name="SelectCategory" xml:space="preserve">
+  <data name="SelectCategory" xml:space="preserve">
     <value>Select category</value>
   </data>
-    <data name="TotalCategories" xml:space="preserve">
+  <data name="TotalCategories" xml:space="preserve">
     <value>Total categories</value>
   </data>
-    <data name="TotalProducts" xml:space="preserve">
+  <data name="TotalProducts" xml:space="preserve">
     <value>Total products</value>
   </data>
-    <data name="EditCategory" xml:space="preserve">
+  <data name="EditCategory" xml:space="preserve">
     <value>Edit category</value>
   </data>
-    <data name="AddCategory" xml:space="preserve">
+  <data name="AddCategory" xml:space="preserve">
     <value>New category</value>
   </data>
-    <data name="CategoriesPageTitle" xml:space="preserve">
+  <data name="CategoriesPageTitle" xml:space="preserve">
     <value>Categories</value>
   </data>
-    <data name="EnterCategoryName" xml:space="preserve">
+  <data name="EnterCategoryName" xml:space="preserve">
     <value>Enter category name</value>
   </data>
-    <data name="EnterProductName" xml:space="preserve">
+  <data name="EnterProductName" xml:space="preserve">
     <value>Enter product name</value>
   </data>
-    <data name="Last30DaysCategoryCount" xml:space="preserve">
+  <data name="Last30DaysCategoryCount" xml:space="preserve">
     <value>Last 30 days category count</value>
   </data>
-    <data name="ProductSales" xml:space="preserve">
+  <data name="ProductSales" xml:space="preserve">
     <value>Product sales</value>
   </data>
-    <data name="ProductSalesText" xml:space="preserve">
+  <data name="ProductSalesText" xml:space="preserve">
     <value>This chart shows the sale number of each product.</value>
   </data>
-    <data name="SearchOnName" xml:space="preserve">
+  <data name="SearchOnName" xml:space="preserve">
     <value>Search on name</value>
   </data>
-    <data name="ProductsCountPerCategoryChart" xml:space="preserve">
+  <data name="ProductsCountPerCategoryChart" xml:space="preserve">
     <value>Products count per category chart</value>
   </data>
-    <data name="ProductsCountPerCategoryChartText" xml:space="preserve">
+  <data name="ProductsCountPerCategoryChartText" xml:space="preserve">
     <value>This chart shows the number of products in each category.</value>
   </data>
-    <data name="ProductsPageTitle" xml:space="preserve">
+  <data name="ProductsPageTitle" xml:space="preserve">
     <value>Products</value>
   </data>
-    <data name="ProductsPercentagePerCategory" xml:space="preserve">
+  <data name="ProductsPercentagePerCategory" xml:space="preserve">
     <value>Products percentage per category</value>
   </data>
-    <data name="ProductsPercentagePerCategoryText" xml:space="preserve">
+  <data name="ProductsPercentagePerCategoryText" xml:space="preserve">
     <value>This chart shows the percentage of products in each category.</value>
   </data>
-    <data name="Categories" xml:space="preserve">
+  <data name="Categories" xml:space="preserve">
   <value>Categories</value>
 </data>
-    <data name="ProductCategory" xml:space="preserve">
+  <data name="ProductCategory" xml:space="preserve">
   <value>Product category</value>
 </data>
-    <data name="Products" xml:space="preserve">
+  <data name="Products" xml:space="preserve">
   <value>Products</value>
 </data>
-    <data name="ProductCouldNotBeFound" xml:space="preserve">
+  <data name="ProductCouldNotBeFound" xml:space="preserve">
   <value>Product entity could not be found</value>
 </data>
-    <data name="CategoryNotEmpty" xml:space="preserve">
+  <data name="CategoryNotEmpty" xml:space="preserve">
   <value>This category contain some products, so you can't delete it</value>
 </data>
-    <data name="AreYouSureWannaDeleteCategory" xml:space="preserve">
+  <data name="AreYouSureWannaDeleteCategory" xml:space="preserve">
   <value>Are you sure you want to delete category {0}</value>
 </data>
-    <data name="AreYouSureWannaDeleteProduct" xml:space="preserve">
+  <data name="AreYouSureWannaDeleteProduct" xml:space="preserve">
   <value>Are you sure you want to delete product {0}</value>
 </data>
-    <data name="DeleteCategory" xml:space="preserve">
+  <data name="DeleteCategory" xml:space="preserve">
   <value>Delete category</value>
 </data>
-    <data name="DeleteProduct" xml:space="preserve">
+  <data name="DeleteProduct" xml:space="preserve">
   <value>Delete product</value>
 </data>
-    <data name="CategoryCouldNotBeFound" xml:space="preserve">
+  <data name="CategoryCouldNotBeFound" xml:space="preserve">
     <value>Category entity could not be found</value>
   </data>
-    <data name="Category" xml:space="preserve">
+  <data name="Category" xml:space="preserve">
     <value>Category</value>
   </data>
-    <data name="DefaultColorPicker" xml:space="preserve">
+  <data name="DefaultColorPicker" xml:space="preserve">
     <value>Default color picker</value>
   </data>
-    <data name="EditProduct" xml:space="preserve">
+  <data name="EditProduct" xml:space="preserve">
     <value>Edit product</value>
   </data>
-    <data name="Dashboard" xml:space="preserve">
+  <data name="Dashboard" xml:space="preserve">
     <value>Dashboard</value>
   </data>
-    <!--#endif -->
+  <!--#endif -->
 </root>
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/IdentityStrings.fr.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/IdentityStrings.fr.resx
index f8293653b4..93df6df881 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/IdentityStrings.fr.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/IdentityStrings.fr.resx
@@ -135,15 +135,6 @@
   <data name="InvalidEmail" xml:space="preserve">
     <value>L'e-mail « {0} » n'est pas valide.</value>
   </data>
-  <data name="InvalidManagerType" xml:space="preserve">
-    <value>Le type {0} doit dériver de {1}&lt;{2}&gt;.</value>
-  </data>
-  <data name="InvalidPasswordHasherCompatibilityMode" xml:space="preserve">
-    <value>Le PasswordHasherCompatibilityMode fourni n’est pas valide.</value>
-  </data>
-  <data name="InvalidPasswordHasherIterationCount" xml:space="preserve">
-    <value>Le nombre d'itérations doit être un entier positif.</value>
-  </data>
   <data name="InvalidRoleName" xml:space="preserve">
     <value>Le nom de rôle « {0} » n'est pas valide.</value>
   </data>
@@ -156,15 +147,6 @@
   <data name="LoginAlreadyAssociated" xml:space="preserve">
     <value>Un utilisateur avec cette connexion existe déjà.</value>
   </data>
-  <data name="MustCallAddIdentity" xml:space="preserve">
-    <value>AddIdentity doit être appelé sur la collection de services.</value>
-  </data>
-  <data name="NoTokenProvider" xml:space="preserve">
-    <value>Aucun IUserTwoFactorTokenProvider&lt;{0}&gt; nommé '{1}' n'est enregistré.</value>
-  </data>
-  <data name="NullSecurityStamp" xml:space="preserve">
-    <value>Le cachet de sécurité de l'utilisateur ne peut pas être nul.</value>
-  </data>
   <data name="PasswordMismatch" xml:space="preserve">
     <value>Mot de passe incorrect.</value>
   </data>
@@ -183,54 +165,6 @@
   <data name="PasswordTooShort" xml:space="preserve">
     <value>Les mots de passe doivent comporter au moins {0} caractères.</value>
   </data>
-  <data name="RoleNotFound" xml:space="preserve">
-    <value>Le rôle {0} n'existe pas.</value>
-  </data>
-  <data name="StoreNotIQueryableRoleStore" xml:space="preserve">
-    <value>Store n’implémente pas IQueryableRoleStore&lt;TRole&gt;.</value>
-  </data>
-  <data name="StoreNotIQueryableUserStore" xml:space="preserve">
-    <value>Store n’implémente pas IQueryableUserStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIRoleClaimStore" xml:space="preserve">
-    <value>Store n’implémente pas IRoleClaimStore&lt;TRole&gt;.</value>
-  </data>
-  <data name="StoreNotIUserAuthenticationTokenStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserAuthenticationTokenStore&lt;User&gt;.</value>
-  </data>
-  <data name="StoreNotIUserClaimStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserClaimStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserConfirmationStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserConfirmationStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserEmailStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserEmailStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserLockoutStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserLockoutStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserLoginStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserLoginStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserPasswordStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserPasswordStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserPhoneNumberStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserPhoneNumberStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserRoleStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserRoleStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserSecurityStampStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserSecurityStampStore&lt;TUser&gt;.</value>
-  </data>
-  <data name="StoreNotIUserAuthenticatorKeyStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserAuthenticatorKeyStore&lt;User&gt;.</value>
-  </data>
-  <data name="StoreNotIUserTwoFactorStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserTwoFactorStore&lt;TUser&gt;.</value>
-  </data>
   <data name="RecoveryCodeRedemptionFailed" xml:space="preserve">
     <value>L'utilisation du code de récupération a échoué.</value>
   </data>
@@ -240,31 +174,13 @@
   <data name="UserAlreadyInRole" xml:space="preserve">
     <value>Utilisateur déjà dans le rôle « {0} ».</value>
   </data>
-  <data name="UserLockedOut" xml:space="preserve">
-    <value>L'utilisateur est verrouillé.</value>
-  </data>
   <data name="UserLockoutNotEnabled" xml:space="preserve">
     <value>Le verrouillage n'est pas activé pour cet utilisateur.</value>
   </data>
-  <data name="UserNameNotFound" xml:space="preserve">
-    <value>L'utilisateur {0} n'existe pas.</value>
-  </data>
   <data name="UserNotInRole" xml:space="preserve">
     <value>L'utilisateur n'a pas le rôle « {0} ».</value>
   </data>
-  <data name="StoreNotIUserTwoFactorRecoveryCodeStore" xml:space="preserve">
-    <value>Store n’implémente pas IUserTwoFactorRecoveryCodeStore&lt;User&gt;.</value>
-  </data>
   <data name="PasswordRequiresUniqueChars" xml:space="preserve">
     <value>Les mots de passe doivent utiliser au moins {0} caractères différents.</value>
   </data>
-  <data name="NoRoleType" xml:space="preserve">
-    <value>Aucun RoleType n'a été spécifié, essayez AddRoles&lt;TRole&gt;().</value>
-  </data>
-  <data name="StoreNotIProtectedUserStore" xml:space="preserve">
-    <value>Store n’implémente pas IProtectedUserStore&lt;TUser&gt; qui est requis lorsque ProtectPersonalData = true.</value>
-  </data>
-  <data name="NoPersonalDataProtector" xml:space="preserve">
-    <value>Aucun service IPersonalDataProtector n'a été enregistré, cela est requis lorsque ProtectPersonalData = true.</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/IdentityStrings.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/IdentityStrings.resx
index b90af58bd7..c7dfef04d2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/IdentityStrings.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/IdentityStrings.resx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <!-- 
+  <!-- 
     Microsoft ResX Schema 
     
     Version 2.0
@@ -59,263 +59,150 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-        <xsd:element name="root" msdata:IsDataSet="true">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
             <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string" />
-                            <xsd:attribute name="type" type="xsd:string" />
-                            <xsd:attribute name="mimetype" type="xsd:string" />
-                            <xsd:attribute ref="xml:space" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string" />
-                            <xsd:attribute name="name" type="xsd:string" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-                            <xsd:attribute ref="xml:space" />
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" />
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <!-- ASP.NET Core Identity messages -->
-    <data name="ConcurrencyFailure" xml:space="preserve">
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ConcurrencyFailure" xml:space="preserve">
     <value>Optimistic concurrency failure, object has been modified.</value>
     <comment>Error when optimistic concurrency fails</comment>
   </data>
-    <data name="DefaultError" xml:space="preserve">
+  <data name="DefaultError" xml:space="preserve">
     <value>An unknown failure has occurred.</value>
     <comment>Default identity result error message</comment>
   </data>
-    <data name="DuplicateEmail" xml:space="preserve">
+  <data name="DuplicateEmail" xml:space="preserve">
     <value>Email '{0}' is already taken.</value>
     <comment>Error for duplicate emails</comment>
   </data>
-    <data name="DuplicateRoleName" xml:space="preserve">
+  <data name="DuplicateRoleName" xml:space="preserve">
     <value>Role name '{0}' is already taken.</value>
     <comment>Error for duplicate roles</comment>
   </data>
-    <data name="DuplicateUserName" xml:space="preserve">
+  <data name="DuplicateUserName" xml:space="preserve">
     <value>Username '{0}' is already taken.</value>
     <comment>Error for duplicate user names</comment>
   </data>
-    <data name="InvalidEmail" xml:space="preserve">
+  <data name="InvalidEmail" xml:space="preserve">
     <value>Email '{0}' is invalid.</value>
     <comment>Invalid email</comment>
   </data>
-    <data name="InvalidManagerType" xml:space="preserve">
-    <value>Type {0} must derive from {1}&lt;{2}&gt;.</value>
-    <comment>Error when the manager type is not derived correctly</comment>
-  </data>
-    <data name="InvalidPasswordHasherCompatibilityMode" xml:space="preserve">
-    <value>The provided PasswordHasherCompatibilityMode is invalid.</value>
-    <comment>Error when the password hasher doesn't understand the format it's being asked to produce.</comment>
-  </data>
-    <data name="InvalidPasswordHasherIterationCount" xml:space="preserve">
-    <value>The iteration count must be a positive integer.</value>
-    <comment>Error when the iteration count is &lt; 1.</comment>
-  </data>
-    <data name="InvalidRoleName" xml:space="preserve">
+  <data name="InvalidRoleName" xml:space="preserve">
     <value>Role name '{0}' is invalid.</value>
     <comment>Error for invalid role names</comment>
   </data>
-    <data name="InvalidToken" xml:space="preserve">
+  <data name="InvalidToken" xml:space="preserve">
     <value>Invalid token.</value>
     <comment>Error when a token is not recognized</comment>
   </data>
-    <data name="InvalidUserName" xml:space="preserve">
+  <data name="InvalidUserName" xml:space="preserve">
     <value>Username '{0}' is invalid, can only contain letters or digits.</value>
     <comment>User names can only contain letters or digits</comment>
   </data>
-    <data name="LoginAlreadyAssociated" xml:space="preserve">
+  <data name="LoginAlreadyAssociated" xml:space="preserve">
     <value>A user with this login already exists.</value>
     <comment>Error when a login already linked</comment>
   </data>
-    <data name="MustCallAddIdentity" xml:space="preserve">
-    <value>AddIdentity must be called on the service collection.</value>
-    <comment>Error when AddIdentity is not called</comment>
-  </data>
-    <data name="NoTokenProvider" xml:space="preserve">
-    <value>No IUserTwoFactorTokenProvider&lt;{0}&gt; named '{1}' is registered.</value>
-    <comment>Error when there is no IUserTwoFactorTokenProvider</comment>
-  </data>
-    <data name="NullSecurityStamp" xml:space="preserve">
-    <value>User security stamp cannot be null.</value>
-    <comment>Error when a user's security stamp is null.</comment>
-  </data>
-    <data name="PasswordMismatch" xml:space="preserve">
+  <data name="PasswordMismatch" xml:space="preserve">
     <value>Incorrect password.</value>
     <comment>Error when a password doesn't match</comment>
   </data>
-    <data name="PasswordRequiresDigit" xml:space="preserve">
+  <data name="PasswordRequiresDigit" xml:space="preserve">
     <value>Passwords must have at least one digit ('0'-'9').</value>
     <comment>Error when passwords do not have a digit</comment>
   </data>
-    <data name="PasswordRequiresLower" xml:space="preserve">
+  <data name="PasswordRequiresLower" xml:space="preserve">
     <value>Passwords must have at least one lowercase ('a'-'z').</value>
     <comment>Error when passwords do not have a lowercase letter</comment>
   </data>
-    <data name="PasswordRequiresNonAlphanumeric" xml:space="preserve">
+  <data name="PasswordRequiresNonAlphanumeric" xml:space="preserve">
     <value>Passwords must have at least one non alphanumeric character.</value>
     <comment>Error when password does not have enough non alphanumeric characters</comment>
   </data>
-    <data name="PasswordRequiresUpper" xml:space="preserve">
+  <data name="PasswordRequiresUpper" xml:space="preserve">
     <value>Passwords must have at least one uppercase ('A'-'Z').</value>
     <comment>Error when passwords do not have an uppercase letter</comment>
   </data>
-    <data name="PasswordTooShort" xml:space="preserve">
+  <data name="PasswordTooShort" xml:space="preserve">
     <value>Passwords must be at least {0} characters.</value>
     <comment>Error message for passwords that are too short</comment>
   </data>
-    <data name="RoleNotFound" xml:space="preserve">
-    <value>Role {0} does not exist.</value>
-    <comment>Error when a role does not exist</comment>
-  </data>
-    <data name="StoreNotIQueryableRoleStore" xml:space="preserve">
-    <value>Store does not implement IQueryableRoleStore&lt;TRole&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIQueryableUserStore" xml:space="preserve">
-    <value>Store does not implement IQueryableUserStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIRoleClaimStore" xml:space="preserve">
-    <value>Store does not implement IRoleClaimStore&lt;TRole&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserAuthenticationTokenStore" xml:space="preserve">
-    <value>Store does not implement IUserAuthenticationTokenStore&lt;User&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserClaimStore" xml:space="preserve">
-    <value>Store does not implement IUserClaimStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserConfirmationStore" xml:space="preserve">
-    <value>Store does not implement IUserConfirmationStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserEmailStore" xml:space="preserve">
-    <value>Store does not implement IUserEmailStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserLockoutStore" xml:space="preserve">
-    <value>Store does not implement IUserLockoutStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserLoginStore" xml:space="preserve">
-    <value>Store does not implement IUserLoginStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserPasswordStore" xml:space="preserve">
-    <value>Store does not implement IUserPasswordStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserPhoneNumberStore" xml:space="preserve">
-    <value>Store does not implement IUserPhoneNumberStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserRoleStore" xml:space="preserve">
-    <value>Store does not implement IUserRoleStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserSecurityStampStore" xml:space="preserve">
-    <value>Store does not implement IUserSecurityStampStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserAuthenticatorKeyStore" xml:space="preserve">
-    <value>Store does not implement IUserAuthenticatorKeyStore&lt;User&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="StoreNotIUserTwoFactorStore" xml:space="preserve">
-    <value>Store does not implement IUserTwoFactorStore&lt;TUser&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="RecoveryCodeRedemptionFailed" xml:space="preserve">
+  <data name="RecoveryCodeRedemptionFailed" xml:space="preserve">
     <value>Recovery code redemption failed.</value>
     <comment>Error when a recovery code is not redeemed.</comment>
   </data>
-    <data name="UserAlreadyHasPassword" xml:space="preserve">
+  <data name="UserAlreadyHasPassword" xml:space="preserve">
     <value>User already has a password set.</value>
     <comment>Error when AddPasswordAsync called when a user already has a password</comment>
   </data>
-    <data name="UserAlreadyInRole" xml:space="preserve">
+  <data name="UserAlreadyInRole" xml:space="preserve">
     <value>User already in role '{0}'.</value>
     <comment>Error when a user is already in a role</comment>
   </data>
-    <data name="UserLockedOut" xml:space="preserve">
-    <value>User is locked out.</value>
-    <comment>Error when a user is locked out</comment>
-  </data>
-    <data name="UserLockoutNotEnabled" xml:space="preserve">
+  <data name="UserLockoutNotEnabled" xml:space="preserve">
     <value>Lockout is not enabled for this user.</value>
     <comment>Error when lockout is not enabled</comment>
   </data>
-    <data name="UserNameNotFound" xml:space="preserve">
-    <value>User {0} does not exist.</value>
-    <comment>Error when a user does not exist</comment>
-  </data>
-    <data name="UserNotInRole" xml:space="preserve">
+  <data name="UserNotInRole" xml:space="preserve">
     <value>User is not in role '{0}'.</value>
     <comment>Error when a user is not in the role</comment>
   </data>
-    <data name="StoreNotIUserTwoFactorRecoveryCodeStore" xml:space="preserve">
-    <value>Store does not implement IUserTwoFactorRecoveryCodeStore&lt;User&gt;.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="PasswordRequiresUniqueChars" xml:space="preserve">
+  <data name="PasswordRequiresUniqueChars" xml:space="preserve">
     <value>Passwords must use at least {0} different characters.</value>
     <comment>Error message for passwords that are based on similar characters</comment>
   </data>
-    <data name="NoRoleType" xml:space="preserve">
-    <value>No RoleType was specified, try AddRoles&lt;TRole&gt;().</value>
-    <comment>Error when the IdentityBuilder.RoleType was not specified</comment>
-  </data>
-    <data name="StoreNotIProtectedUserStore" xml:space="preserve">
-    <value>Store does not implement IProtectedUserStore&lt;TUser&gt; which is required when ProtectPersonalData = true.</value>
-    <comment>Error when the store does not implement this interface</comment>
-  </data>
-    <data name="NoPersonalDataProtector" xml:space="preserve">
-    <value>No IPersonalDataProtector service was registered, this is required when ProtectPersonalData = true.</value>
-    <comment>Error when there is no IPersonalDataProtector</comment>
-  </data>
 </root>
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/Contracts/IAuthTokenProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/Contracts/IAuthTokenProvider.cs
index 6f57285c1e..664051aa90 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/Contracts/IAuthTokenProvider.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/Contracts/IAuthTokenProvider.cs
@@ -2,5 +2,6 @@
 
 public interface IAuthTokenProvider
 {
+    bool IsInitialized { get; }
     Task<string?> GetAccessTokenAsync();
 }
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
index 5b8b5e4900..49fc03db7f 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
@@ -2,8 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
         <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
         <InvariantGlobalization>true</InvariantGlobalization>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/JsRuntimeExtension.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IJSRuntimeExtension.cs
similarity index 93%
rename from src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/JsRuntimeExtension.cs
rename to src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IJSRuntimeExtension.cs
index ba3ef05735..198966fcd7 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/JsRuntimeExtension.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IJSRuntimeExtension.cs
@@ -1,6 +1,6 @@
 namespace Microsoft.JSInterop;
 
-public static class JSRuntimeExtension
+public static class IJSRuntimeExtensions
 {
     public static async Task ToggleBodyOverflow(this IJSRuntime jsRuntime, bool isNavOpen)
     {
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IListExtensions.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IListExtensions.cs
index 8f50eb4679..d69651c4e8 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IListExtensions.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IListExtensions.cs
@@ -1,6 +1,6 @@
 namespace System.Collections.Generic;
 
-public static class IListExtensions
+public static class ICollectionExtensions
 {
     // Basically a Polyfill since we now expose IList instead of List
     // which is better but IList doesn't have AddRange
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IServiceCollectionExtensions.cs
index b62f73a582..82398122ae 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/IServiceCollectionExtensions.cs
@@ -8,16 +8,17 @@ public static IServiceCollection AddClientSharedServices(this IServiceCollection
     {
         services.AddSharedServices();
 
-        services.AddScoped<IPrerenderStateService, PrerenderStateService>();
-        services.AddScoped<IExceptionHandler, ExceptionHandler>();
+        services.AddTransient<IPrerenderStateService, PrerenderStateService>();
+        services.AddTransient<IExceptionHandler, ExceptionHandler>();
         services.AddScoped<IPubSubService, PubSubService>();
         services.AddBitBlazorUIServices();
 
+        services.AddTransient<RequestHeadersDelegationHandler>();
         services.AddTransient<RetryDelegatingHandler>();
         services.AddTransient<ExceptionDelegatingHandler>();
         services.AddTransient<HttpClientHandler>();
 
-        services.AddScoped<MessageBoxService>();
+        services.AddTransient<MessageBoxService>();
 
         return services;
     }
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Program.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Program.cs
index dd6cdd4b8b..97d0385dc3 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Program.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Program.cs
@@ -13,7 +13,6 @@
 }
 
 builder.Services.AddSingleton(sp => new HttpClient(sp.GetRequiredService<RetryDelegatingHandler>()) { BaseAddress = apiServerAddress });
-builder.Services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();
 
 builder.Services.AddClientSharedServices();
 
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Routes.razor b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Routes.razor
index 181706f466..942af269b1 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Routes.razor
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Routes.razor
@@ -1,12 +1,11 @@
 <LayoutView Layout="@typeof(MainLayout)">
     <PageTitle>bit platform software development as a service</PageTitle>
-    <Router AppAssembly="@GetType().Assembly"
-            OnNavigateAsync="@OnNavigateAsync">
+    <Router AppAssembly="@GetType().Assembly">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" />
         </Found>
         <NotFound>
-            <NotFoundPage />
+            <PageNotFound />
         </NotFound>
         <Navigating>
             <LoadingComponent Color="#FFF" />
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Routes.razor.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Routes.razor.cs
index 78578a2fb8..1f82b7a8dc 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Routes.razor.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Routes.razor.cs
@@ -4,18 +4,4 @@ namespace Bit.Websites.Careers.Client;
 
 public partial class Routes
 {
-    private List<System.Reflection.Assembly> _lazyLoadedAssemblies = [];
-    [AutoInject] private Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader _assemblyLoader = default!;
-
-    private async Task OnNavigateAsync(NavigationContext args)
-    {
-        if (OperatingSystem.IsBrowser())
-        {
-            if ((args.Path is "dashboard") && _lazyLoadedAssemblies.Any(asm => asm.GetName().Name == "Newtonsoft.Json") is false)
-            {
-                var assemblies = await _assemblyLoader.LoadAssembliesAsync(["Newtonsoft.Json.wasm", "System.Private.Xml.wasm", "System.Data.Common.wasm"]);
-                _lazyLoadedAssemblies.AddRange(assemblies);
-            }
-        }
-    }
 }
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/Contracts/IPubSubService.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/Contracts/IPubSubService.cs
index af0d7589be..aed0fec9d8 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/Contracts/IPubSubService.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/Contracts/IPubSubService.cs
@@ -6,5 +6,5 @@
 public interface IPubSubService
 {
     void Publish(string message, object? payload);
-    Action Subscribe(string message, Action<object?> handler);
+    Action Subscribe(string message, Func<object?, Task> handler);
 }
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
index a80a67b5e3..c6f6042b9c 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
@@ -1,21 +1,8 @@
-using System.Net;
+namespace Bit.Websites.Careers.Client.Services.HttpMessageHandlers;
 
-namespace Bit.Websites.Careers.Client.Services.HttpMessageHandlers;
-
-public class ExceptionDelegatingHandler
-    : DelegatingHandler
+public class ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
+    : DelegatingHandler(httpClientHandler)
 {
-    public ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
-        : base(httpClientHandler)
-    {
-
-    }
-
-    public ExceptionDelegatingHandler()
-    {
-
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         bool serverCommunicationSuccess = false;
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
new file mode 100644
index 0000000000..c4132f5b43
--- /dev/null
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
@@ -0,0 +1,15 @@
+using Microsoft.AspNetCore.Components.WebAssembly.Http;
+
+namespace Bit.Websites.Careers.Client.Services.HttpMessageHandlers;
+
+public class RequestHeadersDelegationHandler(RetryDelegatingHandler handler)
+    : DelegatingHandler(handler)
+{
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        request.SetBrowserResponseStreamingEnabled(true);
+
+        return await base.SendAsync(request, cancellationToken);
+    }
+}
+
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
index fdb07de210..3e3aa3cb48 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
@@ -1,18 +1,8 @@
 namespace Bit.Websites.Careers.Client.Services.HttpMessageHandlers;
 
-public class RetryDelegatingHandler
-    : DelegatingHandler
+public class RetryDelegatingHandler(ExceptionDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    public RetryDelegatingHandler(ExceptionDelegatingHandler handler)
-        : base(handler)
-    {
-
-    }
-
-    public RetryDelegatingHandler()
-    {
-
-    }
 
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/PrerenderStateService.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/PrerenderStateService.cs
index 05076d9fce..ec69b0b272 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/PrerenderStateService.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/PrerenderStateService.cs
@@ -1,6 +1,4 @@
 
-using Microsoft.AspNetCore.Components.Web;
-
 namespace Bit.Websites.Careers.Client.Services;
 
 // Using this class, persisting the application state on Pre-Rendering mode (explained here: https://docs.microsoft.com/en-us/aspnet/core/blazor/components/prerendering-and-integration#persist-prerendered-state) will be very simple in this multi-mode Template project.
@@ -14,11 +12,7 @@ public class PrerenderStateService : IPrerenderStateService, IAsyncDisposable
     public PrerenderStateService(PersistentComponentState applicationState)
     {
         _applicationState = applicationState;
-
-        if (OperatingSystem.IsBrowser() is false)
-        {
-            _subscription = applicationState.RegisterOnPersisting(PersistAsJson, RenderModeProvider.Current);
-        }
+        _subscription = applicationState.RegisterOnPersisting(PersistAsJson, RenderModeProvider.Current);
     }
 
     public async Task<T?> GetValue<T>(string key, Func<Task<T?>> factory)
@@ -32,8 +26,6 @@ public PrerenderStateService(PersistentComponentState applicationState)
 
     void Persist<T>(string key, T value)
     {
-        if (OperatingSystem.IsBrowser())
-            return;
         _values.TryRemove(key, out object? _);
         _values.TryAdd(key, value);
     }
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/PubSubService.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/PubSubService.cs
index 40066461c6..e29413ca16 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/PubSubService.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/PubSubService.cs
@@ -3,19 +3,25 @@
 /// <summary>
 /// For more information <see cref="IPubSubService"/> docs.
 /// </summary>
-public class PubSubService : IPubSubService
+public partial class PubSubService : IPubSubService
 {
-    private readonly ConcurrentDictionary<string, List<Action<object?>>> _handlers = new();
+    [AutoInject] private IServiceProvider _serviceProvider = default!;
+
+    private readonly ConcurrentDictionary<string, List<Func<object?, Task>>> _handlers = new();
 
     public void Publish(string message, object? payload)
     {
         if (_handlers.TryGetValue(message, out var handlers))
         {
-            handlers.ForEach(handler => handler(payload));
+            foreach (var handler in handlers)
+            {
+                handler(payload)
+                    .ContinueWith(t => _serviceProvider.GetRequiredService<IExceptionHandler>().Handle(t.Exception!), TaskContinuationOptions.OnlyOnFaulted);
+            }
         }
     }
 
-    public Action Subscribe(string message, Action<object?> handler)
+    public Action Subscribe(string message, Func<object?, Task> handler)
     {
         var handlers = _handlers.ContainsKey(message)
                             ? _handlers[message]
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/RenderModeProvider.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/RenderModeProvider.cs
index 399e184c35..59bd3db4c3 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/RenderModeProvider.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Services/RenderModeProvider.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Components.Web;
+//-:cnd:noEmit
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Bit.Websites.Careers.Client.Services;
 
@@ -14,5 +15,10 @@ public static class RenderModeProvider
 
     // PrerenderOnly: In order to have prerender only mode, simply remove @rendermode usages from App.razor
 
-    public static IComponentRenderMode Current => PrerenderEnabledAuto;
+    public static IComponentRenderMode Current =>
+#if DEBUG
+    PrerenderEnabledBlazorServer; // Or BlazorServer, for better development experience.
+#else
+    PrerenderEnabledAuto;
+#endif
 }
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Shared/AppComponentBase.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Shared/AppComponentBase.cs
index 1b9e91f4a9..4409a50788 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Shared/AppComponentBase.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Shared/AppComponentBase.cs
@@ -20,7 +20,7 @@ public partial class AppComponentBase : ComponentBase
 
     [AutoInject] protected NavigationManager NavigationManager = default!;
 
-    [AutoInject] protected IExceptionHandler ExceptionHandler { get; set; } = default!;
+    [AutoInject] protected IExceptionHandler ExceptionHandler = default!;
 
     protected sealed override async Task OnInitializedAsync()
     {
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Shared/ChangePrerenderResponseStatusCode.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Shared/ChangePrerenderResponseStatusCode.cs
deleted file mode 100644
index 4ad06e9bda..0000000000
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Shared/ChangePrerenderResponseStatusCode.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Net;
-
-namespace Bit.Websites.Careers.Client.Shared;
-
-/// <summary>
-/// This component is used during prerendering to determine the value of the StatusCode parameter for the returned HTTP response.
-/// </summary>
-public partial class ChangePrerenderResponseStatusCode : AppComponentBase
-{
-    [Parameter]
-    public HttpStatusCode StatusCode { get; set; }
-
-    private static readonly Type? _httpContextAccessorType = Type.GetType("Microsoft.AspNetCore.Http.IHttpContextAccessor, Microsoft.AspNetCore.Http.Abstractions");
-
-    [AutoInject]
-    public IServiceProvider _serviceProvider = default!;
-
-    protected override Task OnInitAsync()
-    {
-        if (_httpContextAccessorType is not null)
-        {
-            var httpContextAccessor = _serviceProvider.GetService(_httpContextAccessorType);
-
-            var httpContextProperty = _httpContextAccessorType.GetProperty("HttpContext")!;
-
-            var httpContext = httpContextProperty.GetValue(httpContextAccessor)!;
-
-            var response = httpContext.GetType().GetProperty("Response")!.GetValue(httpContext)!;
-
-            response.GetType().GetProperty("StatusCode")!.SetValue(response, (int)StatusCode);
-        }
-
-        return base.OnInitAsync();
-    }
-}
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/appsettings.json b/src/Websites/Careers/src/Bit.Websites.Careers.Client/appsettings.json
index 423ad00545..84ec89dc0f 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/appsettings.json
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/appsettings.json
@@ -1,12 +1,3 @@
 {
-    "DetailedErrors": true,
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "AllowedHosts": "*",
     "ApiServerAddress": "api/" // You can also use absolute urls such as http://192.168.1.150:5000/api/ or https://todob.bitplatform.dev/api/
 }
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/compilerconfig.json b/src/Websites/Careers/src/Bit.Websites.Careers.Client/compilerconfig.json
index 02f3e141d2..002853d272 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/compilerconfig.json
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/compilerconfig.json
@@ -1,19 +1,19 @@
 [
     {
-        "outputFile": "Shared/MainLayout.razor.css",
-        "inputFile": "Shared/MainLayout.razor.scss",
+        "outputFile": "Shared/AppErrorBoundary.razor.css",
+        "inputFile": "Shared/AppErrorBoundary.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/AppErrorBoundary.razor.css",
-        "inputFile": "Shared/AppErrorBoundary.razor.scss",
+        "outputFile": "Shared/Footer.razor.css",
+        "inputFile": "Shared/Footer.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/MessageBox.razor.css",
-        "inputFile": "Shared/MessageBox.razor.scss",
+        "outputFile": "Shared/Header.razor.css",
+        "inputFile": "Shared/Header.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -24,8 +24,20 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Footer.razor.css",
-        "inputFile": "Shared/Footer.razor.scss",
+        "outputFile": "Shared/LoadingComponent.razor.css",
+        "inputFile": "Shared/LoadingComponent.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Shared/MainLayout.razor.css",
+        "inputFile": "Shared/MainLayout.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Shared/MessageBox.razor.css",
+        "inputFile": "Shared/MessageBox.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -46,11 +58,5 @@
         "inputFile": "Components/IntroBox.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
-    },
-    {
-        "outputFile": "Pages/HomePage.razor.css",
-        "inputFile": "Pages/HomePage.razor.scss",
-        "minify": { "enabled": false },
-        "options": { "sourceMap": false }
     }
 ]
\ No newline at end of file
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
index 77127267c7..3afee0582c 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
@@ -2,8 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Extensions/IServiceCollectionExtensions.cs
index 87a24c88c9..85a6191df4 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Extensions/IServiceCollectionExtensions.cs
@@ -9,32 +9,20 @@ public static class IServiceCollectionExtensions
 {
     public static void AddBlazor(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddScoped(sp =>
+        services.AddTransient(sp =>
         {
-            IHttpClientFactory httpClientFactory = sp.GetRequiredService<IHttpClientFactory>();
-            return httpClientFactory.CreateClient("BlazorHttpClient");
-            // This registers HttpClient for pre rendering & blazor server only, so to use http client to call 3rd party apis and other use cases,
-            // either use services.AddHttpClient("NamedHttpClient") or services.AddHttpClient<TypedHttpClient>();
-        });
+            Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
 
-        // In the Pre-Rendering mode, the configured HttpClient will use the access_token provided by the cookie in the request, so the pre-rendered content would be fitting for the current user.
-        services.AddHttpClient("BlazorHttpClient")
-            .AddHttpMessageHandler(sp => new RetryDelegatingHandler())
-            .AddHttpMessageHandler(sp => new ExceptionDelegatingHandler())
-            .ConfigurePrimaryHttpMessageHandler<HttpClientHandler>()
-            .ConfigureHttpClient((sp, httpClient) =>
+            if (apiServerAddress!.IsAbsoluteUri is false)
             {
-                Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
-
-                if (apiServerAddress!.IsAbsoluteUri is false)
-                {
-                    apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
-                }
-
-                httpClient.BaseAddress = apiServerAddress;
-            });
+                apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
+            }
 
-        services.AddScoped<LazyAssemblyLoader>();
+            return new HttpClient(sp.GetRequiredService<RequestHeadersDelegationHandler>())
+            {
+                BaseAddress = apiServerAddress
+            };
+        });
 
         services.AddRazorComponents()
             .AddInteractiveServerComponents()
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs
index 5247560b11..92eb7b4544 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs
@@ -1,6 +1,8 @@
-using System.Reflection;
+using System.Net;
+using System.Reflection;
 using Bit.Websites.Careers.Server.Components;
 using HealthChecks.UI.Client;
+using Microsoft.AspNetCore.Components.Endpoints;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Net.Http.Headers;
@@ -23,22 +25,7 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
             app.UseResponseCompression();
         }
 
-        app.UseStatusCodePages(options: new()
-        {
-            HandleAsync = async (statusCodeContext) =>
-            {
-                var httpContext = statusCodeContext.HttpContext;
-
-                if (httpContext.Response.StatusCode is 404)
-                {
-                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
-                }
-                else if (httpContext.Response.StatusCode is 401)
-                {
-                    httpContext.Response.Redirect($"/not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
-                }
-            }
-        });
+        Configure_404_Page(app);
 
         app.UseStaticFiles(new StaticFileOptions
         {
@@ -82,4 +69,38 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
             .AddInteractiveWebAssemblyRenderMode()
             .AddAdditionalAssemblies(Assembly.Load("Bit.Websites.Careers.Client"));
     }
+
+    private static void Configure_404_Page(WebApplication app)
+    {
+        app.Use(async (context, next) =>
+        {
+            if (context.Request.Path.HasValue)
+            {
+                if (context.Request.Path.Value.Contains("not-found", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
+            }
+
+            await next.Invoke(context);
+        });
+
+        app.UseStatusCodePages(options: new()
+        {
+            HandleAsync = async (statusCodeContext) =>
+            {
+                var httpContext = statusCodeContext.HttpContext;
+
+                if (httpContext.Response.StatusCode is 404 &&
+                                    httpContext.GetEndpoint() is null /* Please be aware that certain endpoints, particularly those associated with web API actions, may intentionally return a 404 error. */)
+                {
+                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
+                }
+                else
+                {
+                    await statusCodeContext.Next.Invoke(statusCodeContext.HttpContext);
+                }
+            }
+        });
+    }
 }
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Services.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Services.cs
index 7827c4a86e..964ef47af9 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Services.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Services.cs
@@ -47,7 +47,7 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.Configure<AppSettings>(configuration.GetSection(nameof(AppSettings)));
 
-        services.AddScoped(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
+        services.AddTransient(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
 
         services.AddEndpointsApiExplorer();
 
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Extensions/IServiceCollectionExtensions.cs
index 032175b882..c1a3e9eb7c 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Extensions/IServiceCollectionExtensions.cs
@@ -8,7 +8,7 @@ public static IServiceCollection AddSharedServices(this IServiceCollection servi
     {
         // Services being registered here can get injected everywhere (Api, Web, Android, iOS, Windows, macOS and Linux)
 
-        services.AddSingleton<IDateTimeProvider, DateTimeProvider>();
+        services.AddTransient<IDateTimeProvider, DateTimeProvider>();
 
         return services;
     }
diff --git a/src/Websites/Careers/src/Directory.Build.props b/src/Websites/Careers/src/Directory.Build.props
index fbe1cbabd0..2c683af6aa 100644
--- a/src/Websites/Careers/src/Directory.Build.props
+++ b/src/Websites/Careers/src/Directory.Build.props
@@ -1,11 +1,11 @@
 <!-- Generated by bit-dual template v-8.1.0-pre-02 -->
 <Project>
     <PropertyGroup>
-        <Nullable>enable</Nullable>
+        <LangVersion>12.0</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <Nullable>enable</Nullable>
         <NoWarn>$(NoWarn);CS1998;CS1591</NoWarn>
-        <LangVersion>12.0</LangVersion>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>
 
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
index e5b85490f5..9072f384c9 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
@@ -2,8 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
         <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
         <InvariantGlobalization>true</InvariantGlobalization>
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/JsRuntimeExtension.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IJSRuntimeExtension.cs
similarity index 93%
rename from src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/JsRuntimeExtension.cs
rename to src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IJSRuntimeExtension.cs
index ba3ef05735..198966fcd7 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Extensions/JsRuntimeExtension.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IJSRuntimeExtension.cs
@@ -1,6 +1,6 @@
 namespace Microsoft.JSInterop;
 
-public static class JSRuntimeExtension
+public static class IJSRuntimeExtensions
 {
     public static async Task ToggleBodyOverflow(this IJSRuntime jsRuntime, bool isNavOpen)
     {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IListExtensions.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IListExtensions.cs
index 8f50eb4679..d69651c4e8 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IListExtensions.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IListExtensions.cs
@@ -1,6 +1,6 @@
 namespace System.Collections.Generic;
 
-public static class IListExtensions
+public static class ICollectionExtensions
 {
     // Basically a Polyfill since we now expose IList instead of List
     // which is better but IList doesn't have AddRange
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IServiceCollectionExtensions.cs
index e9a5bc7413..a3dd74c335 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/IServiceCollectionExtensions.cs
@@ -10,16 +10,17 @@ public static IServiceCollection AddClientSharedServices(this IServiceCollection
 
         services.AddScoped<NavManuService>();
 
-        services.AddScoped<IPrerenderStateService, PrerenderStateService>();
-        services.AddScoped<IExceptionHandler, ExceptionHandler>();
+        services.AddTransient<IPrerenderStateService, PrerenderStateService>();
+        services.AddTransient<IExceptionHandler, ExceptionHandler>();
         services.AddScoped<IPubSubService, PubSubService>();
         services.AddBitBlazorUIServices();
 
+        services.AddTransient<RequestHeadersDelegationHandler>();
         services.AddTransient<RetryDelegatingHandler>();
         services.AddTransient<ExceptionDelegatingHandler>();
         services.AddTransient<HttpClientHandler>();
 
-        services.AddScoped<MessageBoxService>();
+        services.AddTransient<MessageBoxService>();
 
         return services;
     }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/ContactUsPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/ContactUsPage.razor
index 172b2a0775..4048ec9ea1 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/ContactUsPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/ContactUsPage.razor
@@ -9,8 +9,8 @@
     <section class="page-section">
         <div class="page-section-content">
             <BitTypography Variant="BitTypographyVariant.H1" Gutter Class="page-title">Contact us</BitTypography>
-             <br />
-             <BitTypography Variant="BitTypographyVariant.H5" Gutter>
+            <br />
+            <BitTypography Variant="BitTypographyVariant.H5" Gutter>
                 Let's talk about your project.<br />Send us a message and we will get back to you within one business day.
             </BitTypography>
             <br />
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/HomePage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/HomePage.razor
index 82cdab839a..b84b00130d 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/HomePage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/HomePage.razor
@@ -10,27 +10,27 @@
         <div class="page-section-content">
             <div class="hero-section-content">
                 <BitTypography Variant="BitTypographyVariant.H1" Gutter Class="hero-title">bit platform</BitTypography>
-                 <BitTypography Variant="BitTypographyVariant.H5" Gutter Style="font-weight: 300">
-                     Build everything for everywhere using what you already know and love
-                 </BitTypography>
-                 <br /><br />
-                 <BitButton Class="hero-quickstart-button">
-                     <a Class="hero-quickstart-link" href="#quick-start">
-                         <BitTypography Variant="BitTypographyVariant.H6" Class="hero-quickstart-text">Quick start &nbsp; <BitIcon IconName="@BitIconName.ChevronRightSmall" /></BitTypography>
-                     </a>
-                 </BitButton>
-             </div>
-             <div class="hero-section-banner-container">
-                 <div class="hero-section-banner">
-                     <img src="/images/home/banner.webp" />
-                 </div>
-             </div>
-         </div>
-     </section>
+                <BitTypography Variant="BitTypographyVariant.H5" Gutter Style="font-weight: 300">
+                    Build everything for everywhere using what you already know and love
+                </BitTypography>
+                <br /><br />
+                <BitButton Class="hero-quickstart-button">
+                    <a Class="hero-quickstart-link" href="#quick-start">
+                        <BitTypography Variant="BitTypographyVariant.H6" Class="hero-quickstart-text">Quick start &nbsp; <BitIcon IconName="@BitIconName.ChevronRightSmall" /></BitTypography>
+                    </a>
+                </BitButton>
+            </div>
+            <div class="hero-section-banner-container">
+                <div class="hero-section-banner">
+                    <img src="/images/home/banner.webp" />
+                </div>
+            </div>
+        </div>
+    </section>
 
-     <section class="page-section intro-section">
-         <div class="page-section-content">
-             <BitTypography Variant="BitTypographyVariant.H3" Gutter>What is bit platform?</BitTypography>
+    <section class="page-section intro-section">
+        <div class="page-section-content">
+            <BitTypography Variant="BitTypographyVariant.H3" Gutter>What is bit platform?</BitTypography>
             <BitTypography Variant="BitTypographyVariant.Subtitle1">
                 bit platform is a set of tools for <b>.NET</b> developers to easily <b>Code, Build & Deploy</b> their projects across <span class="blue-txt"><b>multiple platforms</b></span>.<br />
                 Our mission is to make development easier.
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/HomePage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/HomePage.razor.cs
index 68309f1a7e..16016c3390 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/HomePage.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/HomePage.razor.cs
@@ -2,8 +2,6 @@
 
 public partial class HomePage
 {
-    [AutoInject] public IJSRuntime JSRuntime { get; set; } = default!;
-
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         await base.OnAfterRenderAsync(firstRender);
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/PricingPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/PricingPage.razor
index 079e959dcf..43113b0d05 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/PricingPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/PricingPage.razor
@@ -23,22 +23,22 @@
         <div class="page-section-content">
             <div class="mid-container">
                 <BitTypography Variant="BitTypographyVariant.H4" Gutter Class="blue-txt">
-                     Get the features and support you need today
-                 </BitTypography>
-                 <hr style="width:100%" />
-                 <BitTypography Variant="BitTypographyVariant.H5">
-                     Easily upgrade as your needs evolve
-                 </BitTypography>
-             </div>
-         </div>
-     </section>
+                    Get the features and support you need today
+                </BitTypography>
+                <hr style="width:100%" />
+                <BitTypography Variant="BitTypographyVariant.H5">
+                    Easily upgrade as your needs evolve
+                </BitTypography>
+            </div>
+        </div>
+    </section>
 
-     <section class="page-section plans-section">
-         <div class="page-section-content">
-             <div class="plan-card-list">
-                 <div class="plan-card">
-                     <div class="plan-card-header">
-                         <BitTypography Variant="BitTypographyVariant.H5" Gutter>Community</BitTypography>
+    <section class="page-section plans-section">
+        <div class="page-section-content">
+            <div class="plan-card-list">
+                <div class="plan-card">
+                    <div class="plan-card-header">
+                        <BitTypography Variant="BitTypographyVariant.H5" Gutter>Community</BitTypography>
                     </div>
                     <div class="plan-card-body">
                         <div class="plan-card-title">
@@ -117,9 +117,9 @@
         {
             <div class="modal-message-container">
                 <BitTypography Variant="BitTypographyVariant.H3" Gutter>Thanks</BitTypography>
-             <BitTypography Variant="BitTypographyVariant.H6" Gutter>Your request has been sent</BitTypography>
-             <BitTypography Variant="BitTypographyVariant.Body1">We will contact you soon</BitTypography>
-             <BitTypography Variant="BitTypographyVariant.Body1"><b>@_buyPackageModel.Email</b></BitTypography>
+                <BitTypography Variant="BitTypographyVariant.H6" Gutter>Your request has been sent</BitTypography>
+                <BitTypography Variant="BitTypographyVariant.Body1">We will contact you soon</BitTypography>
+                <BitTypography Variant="BitTypographyVariant.Body1"><b>@_buyPackageModel.Email</b></BitTypography>
             </div>
         }
         else
@@ -129,22 +129,22 @@
                 <DataAnnotationsValidator />
                 <BitTypography Variant="BitTypographyVariant.H3" Gutter>Buy <span class="blue-txt">@_selectedPackageTitle</span> Package</BitTypography>
                 <BitTypography Variant="BitTypographyVariant.H4" Gutter>@_selectedPackagePrice</BitTypography>
-                    <BitTextField @bind-Value="@_buyPackageModel.Email"
-                                  Label="Email"
-                                  IsRequired="true"
-                                  Class="modal-text-field"
-                                  Placeholder="Enter your email address" />
-                    <ValidationMessage For="() => _buyPackageModel.Email" />
+                <BitTextField @bind-Value="@_buyPackageModel.Email"
+                              Label="Email"
+                              IsRequired="true"
+                              Class="modal-text-field"
+                              Placeholder="Enter your email address" />
+                <ValidationMessage For="() => _buyPackageModel.Email" />
 
-                    <BitTextField @bind-Value="@_buyPackageModel.Message"
-                                  Label="Message"
-                                  IsMultiline="true"
-                                  Class="modal-text-field"
-                                  Placeholder="Enter your message" />
-                    <ValidationMessage For="() => _buyPackageModel.Message" />
+                <BitTextField @bind-Value="@_buyPackageModel.Message"
+                              Label="Message"
+                              IsMultiline="true"
+                              Class="modal-text-field"
+                              Placeholder="Enter your message" />
+                <ValidationMessage For="() => _buyPackageModel.Message" />
 
-                    <BitButton ButtonType="BitButtonType.Submit" IsLoading="_isSending">Send</BitButton>
-                </EditForm>
+                <BitButton ButtonType="BitButtonType.Submit" IsLoading="_isSending">Send</BitButton>
+            </EditForm>
         }
     </BitModal>
 </div>
\ No newline at end of file
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/DeploymentTypePage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/DeploymentTypePage.razor
index 897d64038b..e5ef548904 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/DeploymentTypePage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/DeploymentTypePage.razor
@@ -42,8 +42,8 @@
     <section class="section-card">
         <BitTypography Variant="BitTypographyVariant.H5" Gutter>SpaPrerendered</BitTypography>
         <div class="section-card-txt">
-            <a href="https://www.educative.io/edpresso/what-is-server-side-rendering" rel="nofollow">Server-side rendering</a> (SSR), 
-            is the ability of an application to contribute by displaying the web-page on the server instead of rendering it in the browser. 
+            <a href="https://www.educative.io/edpresso/what-is-server-side-rendering" rel="nofollow">Server-side rendering</a> (SSR),
+            is the ability of an application to contribute by displaying the web-page on the server instead of rendering it in the browser.
             Server-side sends a fully rendered page to the client; Blazor pre-renders page and sends it as a static page, then later the page becomes an interactive Blazor app.
             This behavior is intended to serve pages quickly to search engines with time-based positioning.
             Statically prerender the component along with a marker to indicate the component should later be rendered interactively by the Blazor app. It improve SEO.
@@ -71,7 +71,7 @@
         <BitTypography Variant="BitTypographyVariant.H5" Gutter>PwaPrerendered</BitTypography>
         <div class="section-card-txt">
             <a href="https://www.educative.io/edpresso/what-is-server-side-rendering" rel="nofollow">Server-side rendering</a> (SSR),
-            is the ability of an application to contribute by displaying the web-page on the server instead of rendering it in the browser. 
+            is the ability of an application to contribute by displaying the web-page on the server instead of rendering it in the browser.
             Server-side sends a fully rendered page to the client; Blazor pre-renders page and sends it as a static page, then later the page becomes an interactive Blazor app.
             This behavior is intended to serve pages quickly to search engines with time-based positioning.
             Statically prerender the component along with a marker to indicate the component should later be rendered interactively by the Blazor app. It improve SEO.
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/DevOpsPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/DevOpsPage.razor
index db190c7689..dbbc83befc 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/DevOpsPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/DevOpsPage.razor
@@ -18,7 +18,7 @@
     <section class="section-card">
         <BitTypography Variant="BitTypographyVariant.H5" Gutter>CI</BitTypography>
         <div class="section-card-txt">
-            <b>CI</b> pipeline which is located in <b>.github/workflows/ci.yml</b> ensures that every change that is committed into 
+            <b>CI</b> pipeline which is located in <b>.github/workflows/ci.yml</b> ensures that every change that is committed into
             <b>develop branch</b> won't break projects build in the following modes:
         </div>
         <div class="section-card-txt">
@@ -42,13 +42,13 @@
             <b>CD</b> pipeline located in <b>.github/workflows/cd.yml</b> builds and deploys every change committed in the main branch into production.
         </div>
         <div class="section-card-txt">
-            By default, the CD pipeline produces <b>.aab</b> and <b>.apk</b> for android, <b>.ipa</b> for iOS, <b>.exe</b> for Windows and, <b>.pkg</b> for macOS. 
-            It also creates a zip folder that contains API+WebAssembly projects and an 
-            <a href="https://learn.microsoft.com/en-us/ef/core/managing-schemas/migrations/applying?tabs=dotnet-core-cli#bundles" target="_blank">EF core migrations bundle</a> 
+            By default, the CD pipeline produces <b>.aab</b> and <b>.apk</b> for android, <b>.ipa</b> for iOS, <b>.exe</b> for Windows and, <b>.pkg</b> for macOS.
+            It also creates a zip folder that contains API+WebAssembly projects and an
+            <a href="https://learn.microsoft.com/en-us/ef/core/managing-schemas/migrations/applying?tabs=dotnet-core-cli#bundles" target="_blank">EF core migrations bundle</a>
             to migrate your database. This pipeline also uploads all of the produced artifacts to the GitHub Actions artifacts.
         </div>
         <div class="section-card-txt">
-            You can manually deploy the artifacts into corresponding locations (App Stores, Virtual Private Servers), or you can write more scripts to automate these processes. 
+            You can manually deploy the artifacts into corresponding locations (App Stores, Virtual Private Servers), or you can write more scripts to automate these processes.
             For example, we've created a deploy phase for API+WebAssembly that updates the database using the migrations bundle and optionally deploy artifacts to azure web apps.
         </div>
         <div class="section-card-txt">
@@ -59,11 +59,11 @@
   API_SERVER_ADDRESS: 'https://todo.bitplatform.dev/api/' # The API backend URL that clients use to connect to the server.
   APP_SERVICE_NAME: 'app-service-td-test' # Azure Web App name (If you want to deploy your project to the Azure Web App)</pre>
         <div class="section-card-txt">
-            And it also includes the following <a href="https://docs.github.com/en/rest/actions/secrets" target="_blank">GitHub actions secrets</a>. 
+            And it also includes the following <a href="https://docs.github.com/en/rest/actions/secrets" target="_blank">GitHub actions secrets</a>.
             It's important to mention that since the GitHub Actions secrets does not support storing files,
             to store secret files (such as pfx files), you need to convert the files' content to base64 and store the encoded result value as secret values.
         </div>
-        <pre class="code-box"># IdentityCertificate.pfx (See JWT settings section of https://bitplatform.dev/templates/settings)
+        <pre class="code-box"># IdentityCertificate.pfx (See Identity settings section of https://bitplatform.dev/templates/settings)
 API_IDENTITY_CERTIFICATE_FILE_BASE64
 API_IDENTITY_CERTIFICATE_PASSWORD
 -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/HostingModelsPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/HostingModelsPage.razor
index 798ea73072..6d123193be 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/HostingModelsPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/HostingModelsPage.razor
@@ -77,7 +77,7 @@
             from the address bar to access the app itself.
         </div>
         <div class="section-card-txt">
-            <b>Note</b>: The client side (WebAssembly) debugging doesn't work by default, but you can simply enable it by changing the <b>launch profile</b> 
+            <b>Note</b>: The client side (WebAssembly) debugging doesn't work by default, but you can simply enable it by changing the <b>launch profile</b>
             to BlazorWebAssembly as shown in the following image:
             <div class="image-container">
                 <img class="image small" alt="Blazor WASM target" src="/images/templates/blazor-wasm-target.webp" />
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/OverviewPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/OverviewPage.razor
index 716f496d09..44b554c64f 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/OverviewPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/OverviewPage.razor
@@ -72,7 +72,7 @@
                 <img class="template-img" src="/images/templates/todo/todotemplate.webp" alt="TodoTemplate" />
             </div>
             <BitTypography Variant="BitTypographyVariant.Body1">
-                <b>Note</b>: This project template basically is a simplified version of the Boilerplate, and is suited for projects that 
+                <b>Note</b>: This project template basically is a simplified version of the Boilerplate, and is suited for projects that
                 only need a web app and don't require mobile or desktop apps.
             </BitTypography>
         </div>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/SettingsPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/SettingsPage.razor
index f40993544d..53a8cd6ab0 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/SettingsPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/SettingsPage.razor
@@ -35,12 +35,12 @@
     </section>
 
     <section class="section-card">
-        <BitTypography Variant="BitTypographyVariant.H5" Gutter>JWT settings</BitTypography>
+        <BitTypography Variant="BitTypographyVariant.H5" Gutter>Identity settings</BitTypography>
         <div class="section-card-txt">
-            bit project templates use JWT to provide token-based authentication and you can change these settings.
+            bit project templates use bearer token authentication and you can change these settings.
             You can find these settings in the <b>appsettings.json</b> file in the Api project.
         </div>
-        <pre class="code-box">"JwtSettings": {
+        <pre class="code-box">"IdentitySettings": {
     "IdentityCertificatePassword": "P@ssw0rdP@ssw0rd",
     "Issuer": "Boilerplate",
     "Audience": "Boilerplate",
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Program.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Program.cs
index 1e201b862b..7b5b7e7199 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Program.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Program.cs
@@ -13,7 +13,6 @@
 }
 
 builder.Services.AddSingleton(sp => new HttpClient(sp.GetRequiredService<RetryDelegatingHandler>()) { BaseAddress = apiServerAddress });
-builder.Services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();
 
 builder.Services.AddClientSharedServices();
 
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Routes.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Routes.razor
index f64262fe36..ba6747d2ae 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Routes.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Routes.razor
@@ -1,6 +1,5 @@
 <LayoutView Layout="@typeof(MainLayout)">
-    <Router AppAssembly="@GetType().Assembly"
-            OnNavigateAsync="@OnNavigateAsync">
+    <Router AppAssembly="@GetType().Assembly">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" />
         </Found>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Routes.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Routes.razor.cs
index bbf7afce3c..c03149d385 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Routes.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Routes.razor.cs
@@ -4,18 +4,4 @@ namespace Bit.Websites.Platform.Client;
 
 public partial class Routes
 {
-    private List<System.Reflection.Assembly> _lazyLoadedAssemblies = [];
-    [AutoInject] private Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader _assemblyLoader = default!;
-
-    private async Task OnNavigateAsync(NavigationContext args)
-    {
-        if (OperatingSystem.IsBrowser())
-        {
-            if ((args.Path is "dashboard") && _lazyLoadedAssemblies.Any(asm => asm.GetName().Name == "Newtonsoft.Json") is false)
-            {
-                var assemblies = await _assemblyLoader.LoadAssembliesAsync(["Newtonsoft.Json.wasm", "System.Private.Xml.wasm", "System.Data.Common.wasm"]);
-                _lazyLoadedAssemblies.AddRange(assemblies);
-            }
-        }
-    }
 }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/Contracts/IPubSubService.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/Contracts/IPubSubService.cs
index eacbed7f4d..f1d15f6bdf 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/Contracts/IPubSubService.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/Contracts/IPubSubService.cs
@@ -6,5 +6,5 @@
 public interface IPubSubService
 {
     void Publish(string message, object? payload);
-    Action Subscribe(string message, Action<object?> handler);
+    Action Subscribe(string message, Func<object?, Task> handler);
 }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
index b50a6e74da..12a989e84b 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
@@ -2,20 +2,9 @@
 
 namespace Bit.Websites.Platform.Client.Services.HttpMessageHandlers;
 
-public class ExceptionDelegatingHandler
-    : DelegatingHandler
+public class ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
+    : DelegatingHandler(httpClientHandler)
 {
-    public ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
-        : base(httpClientHandler)
-    {
-
-    }
-
-    public ExceptionDelegatingHandler()
-    {
-
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         bool serverCommunicationSuccess = false;
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
new file mode 100644
index 0000000000..a2492e580c
--- /dev/null
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
@@ -0,0 +1,15 @@
+using Microsoft.AspNetCore.Components.WebAssembly.Http;
+
+namespace Bit.Websites.Platform.Client.Services.HttpMessageHandlers;
+
+public class RequestHeadersDelegationHandler(RetryDelegatingHandler handler)
+    : DelegatingHandler(handler)
+{
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        request.SetBrowserResponseStreamingEnabled(true);
+
+        return await base.SendAsync(request, cancellationToken);
+    }
+}
+
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
index 5c6b7f244b..40376916f8 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
@@ -1,18 +1,8 @@
 namespace Bit.Websites.Platform.Client.Services.HttpMessageHandlers;
 
-public class RetryDelegatingHandler
-    : DelegatingHandler
+public class RetryDelegatingHandler(ExceptionDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    public RetryDelegatingHandler(ExceptionDelegatingHandler handler)
-        : base(handler)
-    {
-
-    }
-
-    public RetryDelegatingHandler()
-    {
-
-    }
 
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/PrerenderStateService.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/PrerenderStateService.cs
index 98e2f08290..684ba55e5c 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/PrerenderStateService.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/PrerenderStateService.cs
@@ -1,6 +1,4 @@
 
-using Microsoft.AspNetCore.Components.Web;
-
 namespace Bit.Websites.Platform.Client.Services;
 
 // Using this class, persisting the application state on Pre-Rendering mode (explained here: https://docs.microsoft.com/en-us/aspnet/core/blazor/components/prerendering-and-integration#persist-prerendered-state) will be very simple in this multi-mode Template project.
@@ -14,11 +12,7 @@ public class PrerenderStateService : IPrerenderStateService, IAsyncDisposable
     public PrerenderStateService(PersistentComponentState applicationState)
     {
         _applicationState = applicationState;
-
-        if (OperatingSystem.IsBrowser() is false)
-        {
-            _subscription = applicationState.RegisterOnPersisting(PersistAsJson, RenderModeProvider.Current);
-        }
+         _subscription = applicationState.RegisterOnPersisting(PersistAsJson, RenderModeProvider.Current);
     }
 
     public async Task<T?> GetValue<T>(string key, Func<Task<T?>> factory)
@@ -32,8 +26,6 @@ public PrerenderStateService(PersistentComponentState applicationState)
 
     void Persist<T>(string key, T value)
     {
-        if (OperatingSystem.IsBrowser())
-            return;
         _values.TryRemove(key, out object? _);
         _values.TryAdd(key, value);
     }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/PubSubService.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/PubSubService.cs
index f8ac951acc..afec662641 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/PubSubService.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/PubSubService.cs
@@ -3,19 +3,25 @@
 /// <summary>
 /// For more information <see cref="IPubSubService"/> docs.
 /// </summary>
-public class PubSubService : IPubSubService
+public partial class PubSubService : IPubSubService
 {
-    private readonly ConcurrentDictionary<string, List<Action<object?>>> _handlers = new();
+    [AutoInject] private IServiceProvider _serviceProvider = default!;
+
+    private readonly ConcurrentDictionary<string, List<Func<object?, Task>>> _handlers = new();
 
     public void Publish(string message, object? payload)
     {
         if (_handlers.TryGetValue(message, out var handlers))
         {
-            handlers.ForEach(handler => handler(payload));
+            foreach (var handler in handlers)
+            {
+                handler(payload)
+                    .ContinueWith(t => _serviceProvider.GetRequiredService<IExceptionHandler>().Handle(t.Exception!), TaskContinuationOptions.OnlyOnFaulted);
+            }
         }
     }
 
-    public Action Subscribe(string message, Action<object?> handler)
+    public Action Subscribe(string message, Func<object?, Task> handler)
     {
         var handlers = _handlers.ContainsKey(message)
                             ? _handlers[message]
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/RenderModeProvider.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/RenderModeProvider.cs
index addaaca0ab..707c3de931 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/RenderModeProvider.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Services/RenderModeProvider.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Components.Web;
+//-:cnd:noEmit
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Bit.Websites.Platform.Client.Services;
 
@@ -14,5 +15,10 @@ public static class RenderModeProvider
 
     // PrerenderOnly: In order to have prerender only mode, simply remove @rendermode usages from App.razor
 
-    public static IComponentRenderMode Current => PrerenderEnabledAuto;
+    public static IComponentRenderMode Current =>
+#if DEBUG
+    PrerenderEnabledBlazorServer; // Or BlazorServer, for better development experience.
+#else
+    PrerenderEnabledAuto;
+#endif
 }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/AppComponentBase.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/AppComponentBase.cs
index ac97d3762a..2479747273 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/AppComponentBase.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/AppComponentBase.cs
@@ -20,7 +20,7 @@ public partial class AppComponentBase : ComponentBase
 
     [AutoInject] protected NavigationManager NavigationManager = default!;
 
-    [AutoInject] protected IExceptionHandler ExceptionHandler { get; set; } = default!;
+    [AutoInject] protected IExceptionHandler ExceptionHandler = default!;
 
     protected sealed override async Task OnInitializedAsync()
     {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/ChangePrerenderResponseStatusCode.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/ChangePrerenderResponseStatusCode.cs
deleted file mode 100644
index b5c9a3ff93..0000000000
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/ChangePrerenderResponseStatusCode.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Net;
-
-namespace Bit.Websites.Platform.Client.Shared;
-
-/// <summary>
-/// This component is used during prerendering to determine the value of the StatusCode parameter for the returned HTTP response.
-/// </summary>
-public partial class ChangePrerenderResponseStatusCode : AppComponentBase
-{
-    [Parameter]
-    public HttpStatusCode StatusCode { get; set; }
-
-    private static readonly Type? _httpContextAccessorType = Type.GetType("Microsoft.AspNetCore.Http.IHttpContextAccessor, Microsoft.AspNetCore.Http.Abstractions");
-
-    [AutoInject]
-    public IServiceProvider _serviceProvider = default!;
-
-    protected override Task OnInitAsync()
-    {
-        if (_httpContextAccessorType is not null)
-        {
-            var httpContextAccessor = _serviceProvider.GetService(_httpContextAccessorType);
-
-            var httpContextProperty = _httpContextAccessorType.GetProperty("HttpContext")!;
-
-            var httpContext = httpContextProperty.GetValue(httpContextAccessor)!;
-
-            var response = httpContext.GetType().GetProperty("Response")!.GetValue(httpContext)!;
-
-            response.GetType().GetProperty("StatusCode")!.SetValue(response, (int)StatusCode);
-        }
-
-        return base.OnInitAsync();
-    }
-}
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Header.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Header.razor.cs
index 602153790b..8066de4e2f 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Header.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Header.razor.cs
@@ -7,8 +7,8 @@ public partial class Header : IDisposable
     private string _currentUrl = string.Empty;
     private bool _isHeaderMenuOpen;
 
-    [AutoInject] public NavManuService _navManuService { get; set; } = default!;
-    [AutoInject] public BitThemeManager _bitThemeManager { get; set; } = default!;
+    [AutoInject] public NavManuService _navManuService = default!;
+    [AutoInject] public BitThemeManager _bitThemeManager  = default!;
 
     protected override async Task OnInitAsync()
     {
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor
deleted file mode 100644
index 291f7cb44f..0000000000
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor
+++ /dev/null
@@ -1,15 +0,0 @@
-@inherits AppComponentBase
-
-<ChangePrerenderResponseStatusCode StatusCode="System.Net.HttpStatusCode.NotFound" />
-
-<div class="main">
-    <div class="cloud-1"></div>
-    <div class="cloud-2"></div>
-    <div class="cloud-3"></div>
-    <div>
-        <div class="title"></div>
-        <div class="description">Page Not Found</div>
-    </div>
-    <div class="disconnected-cable"></div>
-    <BitButton Class="not-found-back-btn" OnClick="@WrapHandled(BackToHome)">Go Back</BitButton>
-</div>
\ No newline at end of file
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor.cs
deleted file mode 100644
index cfa0de6fea..0000000000
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Bit.Websites.Platform.Client.Shared;
-
-public partial class PageNotFound
-{
-    [AutoInject] public NavigationManager NavigationManager { get; set; }
-
-    private void BackToHome()
-    {
-        NavigationManager.NavigateTo("/");
-    }
-}
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor.scss b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor.scss
deleted file mode 100644
index bb77c4493b..0000000000
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/PageNotFound.razor.scss
+++ /dev/null
@@ -1,168 +0,0 @@
-@import '../Styles/abstracts/_colors.scss';
-@import '../Styles/abstracts/_functions.scss';
-@import '../Styles/abstracts/_media-queries.scss';
-
-
-.main {
-    display: flex;
-    flex-flow: column nowrap;
-    justify-content: space-evenly;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-}
-
-.cloud-1 {
-    background-image: url('/images/cloud.svg');
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-    width: rem2(88px);
-    height: rem2(29px);
-    z-index: -1;
-    position: absolute;
-    top: 14%;
-    right: 37%;
-
-    @include lt-xl {
-        display: none;
-    }
-}
-
-.cloud-2 {
-    background-image: url('/images/cloud.svg');
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-    width: rem2(171px);
-    height: rem2(56px);
-    z-index: -1;
-    position: absolute;
-    top: 23%;
-    right: 23%;
-
-    @include lg {
-        right: 14%;
-    }
-
-    @include md {
-        width: rem2(161px);
-        height: rem2(52px);
-        top: 21%;
-        right: 6%;
-    }
-
-    @include sm {
-        width: rem2(79px);
-        height: rem2(25px);
-        top: 16%;
-        right: 14%;
-    }
-}
-
-.cloud-3 {
-    background-image: url('/images/cloud.svg');
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-    width: rem2(103px);
-    height: rem2(34px);
-    transform: matrix(-1, 0, 0, 1, 0, 0);
-    z-index: -1;
-    position: absolute;
-    top: 33%;
-    left: 34%;
-
-    @include lg {
-        left: 29%;
-    }
-
-    @include md {
-        width: rem2(97px);
-        height: rem2(31px);
-        left: 13%;
-    }
-
-    @include sm {
-        width: rem2(48px);
-        height: rem2(15px);
-        top: 23%;
-        left: 9%;
-    }
-}
-
-.title {
-    background-image: url('/images/404.svg');
-    background-size: contain;
-    background-position: center;
-    background-repeat: no-repeat;
-    width: rem2(288px);
-    height: rem2(240px);
-
-    @include md {
-        width: rem2(216px);
-        height: rem2(168px);
-    }
-
-    @include sm {
-        width: rem2(144px);
-        height: rem2(112px);
-    }
-}
-
-.description {
-    font-weight: 400;
-    font-size: rem2(32px);
-    line-height: rem2(48px);
-    color: $Gray2;
-    text-align: center;
-
-    @include lt-xl {
-        font-size: rem2(24px);
-        line-height: rem2(32px);
-    }
-
-    @include sm {
-        font-size: rem2(18px);
-        line-height: rem2(24px);
-    }
-}
-
-.disconnected-cable {
-    background-image: url('/images/disconnected-cable.svg');
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-    width: 100%;
-    height: rem2(84px);
-
-    @include md {
-        height: rem2(64px);
-    }
-
-    @include sm {
-        height: rem2(28px);
-    }
-}
-
-.not-found-back-btn {
-    width: rem2(213px);
-    height: rem2(56px);
-    font-weight: 600;
-    font-size: rem2(18px);
-    line-height: rem2(32px);
-
-    @include md {
-        width: rem2(161px);
-    }
-
-    @include sm {
-        width: rem2(118px);
-    }
-
-    @include lt-lg {
-        height: rem2(40px);
-        font-size: rem2(12px);
-        line-height: rem2(16px);
-    }
-}
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/appsettings.json b/src/Websites/Platform/src/Bit.Websites.Platform.Client/appsettings.json
index 423ad00545..84ec89dc0f 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/appsettings.json
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/appsettings.json
@@ -1,12 +1,3 @@
 {
-    "DetailedErrors": true,
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "AllowedHosts": "*",
     "ApiServerAddress": "api/" // You can also use absolute urls such as http://192.168.1.150:5000/api/ or https://todob.bitplatform.dev/api/
 }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/compilerconfig.json b/src/Websites/Platform/src/Bit.Websites.Platform.Client/compilerconfig.json
index f8b5acb199..f8369bdd1a 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/compilerconfig.json
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/compilerconfig.json
@@ -1,37 +1,37 @@
 [
     {
-        "outputFile": "Shared/MainLayout.razor.css",
-        "inputFile": "Shared/MainLayout.razor.scss",
+        "outputFile": "Shared/AppErrorBoundary.razor.css",
+        "inputFile": "Shared/AppErrorBoundary.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/AppErrorBoundary.razor.css",
-        "inputFile": "Shared/AppErrorBoundary.razor.scss",
+        "outputFile": "Shared/Footer.razor.css",
+        "inputFile": "Shared/Footer.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/ConfirmMessageBox.razor.css",
-        "inputFile": "Shared/ConfirmMessageBox.razor.scss",
+        "outputFile": "Shared/Header.razor.css",
+        "inputFile": "Shared/Header.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/MessageBox.razor.css",
-        "inputFile": "Shared/MessageBox.razor.scss",
+        "outputFile": "Shared/MainLayout.razor.css",
+        "inputFile": "Shared/MainLayout.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Header.razor.css",
-        "inputFile": "Shared/Header.razor.scss",
+        "outputFile": "Shared/MessageBox.razor.css",
+        "inputFile": "Shared/MessageBox.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Footer.razor.css",
-        "inputFile": "Shared/Footer.razor.scss",
+        "outputFile": "Shared/NavigationButtons.razor.css",
+        "inputFile": "Shared/NavigationButtons.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -42,20 +42,20 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/NotAuthorizedComponent.razor.css",
-        "inputFile": "Shared/NotAuthorizedComponent.razor.scss",
+        "outputFile": "Pages/AboutUsPage.razor.css",
+        "inputFile": "Pages/AboutUsPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/SignOutConfirmModal.razor.css",
-        "inputFile": "Shared/SignOutConfirmModal.razor.scss",
+        "outputFile": "Pages/ComponentsPage.razor.css",
+        "inputFile": "Pages/ComponentsPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/PageNotFound.razor.css",
-        "inputFile": "Shared/PageNotFound.razor.scss",
+        "outputFile": "Pages/ContactUsPage.razor.css",
+        "inputFile": "Pages/ContactUsPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -66,57 +66,99 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/TermsPage.razor.css",
-        "inputFile": "Pages/TermsPage.razor.scss",
+        "outputFile": "Pages/NotFoundPage.razor.css",
+        "inputFile": "Pages/NotFoundPage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Pages/PricingPage.razor.css",
+        "inputFile": "Pages/PricingPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/SignUpPage.razor.css",
-        "inputFile": "Pages/Identity/SignUpPage.razor.scss",
+        "outputFile": "Pages/Templates/CacheMechanismPage.razor.css",
+        "inputFile": "Pages/Templates/CacheMechanismPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/SignInPage.razor.css",
-        "inputFile": "Pages/Identity/SignInPage.razor.scss",
+        "outputFile": "Pages/Templates/CreateProjectPage.razor.css",
+        "inputFile": "Pages/Templates/CreateProjectPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/EmailConfirmationPage.razor.css",
-        "inputFile": "Pages/Identity/EmailConfirmationPage.razor.scss",
+        "outputFile": "Pages/Templates/DatabasePage.razor.css",
+        "inputFile": "Pages/Templates/DatabasePage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/ForgotPasswordPage.razor.css",
-        "inputFile": "Pages/Identity/ForgotPasswordPage.razor.scss",
+        "outputFile": "Pages/Templates/DeploymentTypePage.razor.css",
+        "inputFile": "Pages/Templates/DeploymentTypePage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/ResetPasswordPage.razor.css",
-        "inputFile": "Pages/Identity/ResetPasswordPage.razor.scss",
+        "outputFile": "Pages/Templates/DevelopmentPrerequisitesPage.razor.css",
+        "inputFile": "Pages/Templates/DevelopmentPrerequisitesPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/EditProfilePage.razor.css",
-        "inputFile": "Pages/Identity/EditProfilePage.razor.scss",
+        "outputFile": "Pages/Templates/DevOpsPage.razor.css",
+        "inputFile": "Pages/Templates/DevOpsPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.css",
-        "inputFile": "Pages/Identity/DeleteAccountConfirmModal.razor.scss",
+        "outputFile": "Pages/Templates/ExceptionHandlingPage.razor.css",
+        "inputFile": "Pages/Templates/ExceptionHandlingPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "wwwroot/styles/app.css",
-        "inputFile": "Styles/app.scss",
+        "outputFile": "Pages/Templates/HostingModelsPage.razor.css",
+        "inputFile": "Pages/Templates/HostingModelsPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
+    {
+        "outputFile": "Pages/Templates/MultilingualismPage.razor.css",
+        "inputFile": "Pages/Templates/MultilingualismPage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Pages/Templates/OverviewPage.razor.css",
+        "inputFile": "Pages/Templates/OverviewPage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Pages/Templates/PlatformIntegrationPage.razor.css",
+        "inputFile": "Pages/Templates/PlatformIntegrationPage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Pages/Templates/ProjectStructurePage.razor.css",
+        "inputFile": "Pages/Templates/ProjectStructurePage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Pages/Templates/RunPage.razor.css",
+        "inputFile": "Pages/Templates/RunPage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    },
+    {
+        "outputFile": "Pages/Templates/SettingsPage.razor.css",
+        "inputFile": "Pages/Templates/SettingsPage.razor.scss",
+        "minify": { "enabled": false },
+        "options": { "sourceMap": false }
+    }
 ]
\ No newline at end of file
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
index 1af110045e..0e2e9cfd46 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
@@ -2,8 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Controllers/ContactUsController.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Controllers/ContactUsController.cs
index dd6f72df00..77c86af6d7 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Controllers/ContactUsController.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Controllers/ContactUsController.cs
@@ -7,12 +7,12 @@ namespace Bit.Websites.Platform.Server.Controllers;
 [ApiController]
 public partial class ContactUsController : AppControllerBase
 {
-    [AutoInject] protected TelegramBotService TelegramBotService = default!;
+    [AutoInject] private TelegramBotService _telegramBotService = default!;
 
     [HttpPost]
     public async Task<IActionResult> SendMessage(ContactUsDto contactUsDto, CancellationToken cancellationToken)
     {
-        await TelegramBotService.SendContactUsMessage(contactUsDto.Email, contactUsDto.Message, cancellationToken);
+        await _telegramBotService.SendContactUsMessage(contactUsDto.Email, contactUsDto.Message, cancellationToken);
         return Ok();
     }
 }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Controllers/SupportPackageController.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Controllers/SupportPackageController.cs
index d6d91f139d..3e73c6ecdf 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Controllers/SupportPackageController.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Controllers/SupportPackageController.cs
@@ -7,12 +7,12 @@ namespace Bit.Websites.Platform.Server.Controllers;
 [ApiController]
 public partial class SupportPackageController : AppControllerBase
 {
-    [AutoInject] protected TelegramBotService TelegramBotService = default!;
+    [AutoInject] private TelegramBotService _telegramBotService = default!;
 
     [HttpPost]
     public async Task<IActionResult> BuyPackage(BuyPackageDto buyPackageDto, CancellationToken cancellationToken)
     {
-        await TelegramBotService.SendBuyPackageMessage(buyPackageDto.SalePackageTitle, buyPackageDto.Email, buyPackageDto.Message, cancellationToken);
+        await _telegramBotService.SendBuyPackageMessage(buyPackageDto.SalePackageTitle, buyPackageDto.Email, buyPackageDto.Message, cancellationToken);
         return Ok();
     }
 }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Extensions/IServiceCollectionExtensions.cs
index e2aa5d7e38..1539a85e36 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Extensions/IServiceCollectionExtensions.cs
@@ -9,32 +9,20 @@ public static class IServiceCollectionExtensions
 {
     public static void AddBlazor(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddScoped(sp =>
+        services.AddTransient(sp =>
         {
-            IHttpClientFactory httpClientFactory = sp.GetRequiredService<IHttpClientFactory>();
-            return httpClientFactory.CreateClient("BlazorHttpClient");
-            // This registers HttpClient for pre rendering & blazor server only, so to use http client to call 3rd party apis and other use cases,
-            // either use services.AddHttpClient("NamedHttpClient") or services.AddHttpClient<TypedHttpClient>();
-        });
+            Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
 
-        // In the Pre-Rendering mode, the configured HttpClient will use the access_token provided by the cookie in the request, so the pre-rendered content would be fitting for the current user.
-        services.AddHttpClient("BlazorHttpClient")
-            .AddHttpMessageHandler(sp => new RetryDelegatingHandler())
-            .AddHttpMessageHandler(sp => new ExceptionDelegatingHandler())
-            .ConfigurePrimaryHttpMessageHandler<HttpClientHandler>()
-            .ConfigureHttpClient((sp, httpClient) =>
+            if (apiServerAddress!.IsAbsoluteUri is false)
             {
-                Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
-
-                if (apiServerAddress!.IsAbsoluteUri is false)
-                {
-                    apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
-                }
-
-                httpClient.BaseAddress = apiServerAddress;
-            });
+                apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
+            }
 
-        services.AddScoped<LazyAssemblyLoader>();
+            return new HttpClient(sp.GetRequiredService<RequestHeadersDelegationHandler>())
+            {
+                BaseAddress = apiServerAddress
+            };
+        });
 
         services.AddRazorComponents()
             .AddInteractiveServerComponents()
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Services/TelegramBotApiClient.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Services/TelegramBotApiClient.cs
index b34e12a3f9..b7b6e5495f 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Services/TelegramBotApiClient.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Services/TelegramBotApiClient.cs
@@ -7,17 +7,17 @@ public partial class TelegramBotApiClient
 {
     private const int MAX_LENGTH_MESSAGE = 4096;
 
-    [AutoInject] protected HttpClient HttpClient = default!;
-    [AutoInject] protected IOptionsSnapshot<AppSettings> AppSettings = default!;
+    [AutoInject] private HttpClient httpClient = default!;
+    [AutoInject] private AppSettings _appSettings = default!;
 
     public async Task SendMessageAsync(string message, CancellationToken cancellationToken)
     {
-        if (string.IsNullOrEmpty(AppSettings.Value.TelegramBotSettings.Token) || AppSettings.Value.TelegramBotSettings.ChatIds.Length < 1 || string.IsNullOrEmpty(message))
+        if (string.IsNullOrEmpty(_appSettings.TelegramBotSettings.Token) || _appSettings.TelegramBotSettings.ChatIds.Length < 1 || string.IsNullOrEmpty(message))
         {
             return;
         }
 
-        foreach (var chatId in AppSettings.Value.TelegramBotSettings.ChatIds)
+        foreach (var chatId in _appSettings.TelegramBotSettings.ChatIds)
         {
             if (cancellationToken.IsCancellationRequested)
             {
@@ -40,8 +40,8 @@ private async Task SendMessageAsync(string chatId, string message, CancellationT
             parse_mode = "Markdown"
         };
         var json = JsonSerializer.Serialize(value: payload);
-        var apiUrl = new Uri(uriString: $"https://api.telegram.org/bot{AppSettings.Value.TelegramBotSettings.Token}/sendMessage");
-        await HttpClient.PostAsync(requestUri: apiUrl,
+        var apiUrl = new Uri(uriString: $"https://api.telegram.org/bot{_appSettings.TelegramBotSettings.Token}/sendMessage");
+        await httpClient.PostAsync(requestUri: apiUrl,
             content: new StringContent(content: json, encoding: Encoding.UTF8, mediaType: "application/json"), cancellationToken);
     }
 
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Services/TelegramBotService.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Services/TelegramBotService.cs
index a26c2e0a4d..6cca814c38 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Services/TelegramBotService.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Services/TelegramBotService.cs
@@ -4,7 +4,7 @@ namespace Bit.Websites.Platform.Server.Services;
 
 public partial class TelegramBotService
 {
-    [AutoInject] protected TelegramBotApiClient TelegramBotApiClient = default!;
+    [AutoInject] private TelegramBotApiClient _telegramBotApiClient = default!;
 
     public async Task SendContactUsMessage(string email, string message, CancellationToken cancellationToken)
     {
@@ -20,7 +20,7 @@ public async Task SendContactUsMessage(string email, string message, Cancellatio
 
         messsageBuilder.AppendLine($"📜 *Message*: {message.Trim()}");
 
-        await TelegramBotApiClient.SendMessageAsync(messsageBuilder.ToString(), cancellationToken);
+        await _telegramBotApiClient.SendMessageAsync(messsageBuilder.ToString(), cancellationToken);
     }
 
     public async Task SendBuyPackageMessage(string packageTitle, string email, string message, CancellationToken cancellationToken)
@@ -37,6 +37,6 @@ public async Task SendBuyPackageMessage(string packageTitle, string email, strin
             messsageBuilder.AppendLine($"📜 *Message*: {message.Trim()}");
         }
 
-        await TelegramBotApiClient.SendMessageAsync(messsageBuilder.ToString(), cancellationToken);
+        await _telegramBotApiClient.SendMessageAsync(messsageBuilder.ToString(), cancellationToken);
     }
 }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs
index 3c142af918..58106e5a76 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs
@@ -4,6 +4,8 @@
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Net.Http.Headers;
 using Bit.Websites.Platform.Server.Components;
+using System.Net;
+using Microsoft.AspNetCore.Components.Endpoints;
 
 namespace Bit.Websites.Platform.Server.Startup;
 
@@ -23,22 +25,7 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
             app.UseResponseCompression();
         }
 
-        app.UseStatusCodePages(options: new()
-        {
-            HandleAsync = async (statusCodeContext) =>
-            {
-                var httpContext = statusCodeContext.HttpContext;
-
-                if (httpContext.Response.StatusCode is 404)
-                {
-                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
-                }
-                else if (httpContext.Response.StatusCode is 401)
-                {
-                    httpContext.Response.Redirect($"/not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
-                }
-            }
-        });
+        Configure_404_Page(app);
 
         app.UseStaticFiles(new StaticFileOptions
         {
@@ -82,4 +69,38 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
             .AddInteractiveWebAssemblyRenderMode()
             .AddAdditionalAssemblies(Assembly.Load("Bit.Websites.Platform.Client"));
     }
+
+    private static void Configure_404_Page(WebApplication app)
+    {
+        app.Use(async (context, next) =>
+        {
+            if (context.Request.Path.HasValue)
+            {
+                if (context.Request.Path.Value.Contains("not-found", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
+            }
+
+            await next.Invoke(context);
+        });
+
+        app.UseStatusCodePages(options: new()
+        {
+            HandleAsync = async (statusCodeContext) =>
+            {
+                var httpContext = statusCodeContext.HttpContext;
+
+                if (httpContext.Response.StatusCode is 404 &&
+                                    httpContext.GetEndpoint() is null /* Please be aware that certain endpoints, particularly those associated with web API actions, may intentionally return a 404 error. */)
+                {
+                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
+                }
+                else
+                {
+                    await statusCodeContext.Next.Invoke(statusCodeContext.HttpContext);
+                }
+            }
+        });
+    }
 }
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Services.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Services.cs
index 06484865e8..5d4b421715 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Services.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Services.cs
@@ -49,7 +49,7 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.Configure<AppSettings>(configuration.GetSection(nameof(AppSettings)));
 
-        services.AddScoped(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
+        services.AddTransient(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
 
         services.AddEndpointsApiExplorer();
 
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Extensions/IServiceCollectionExtensions.cs
index d64e389243..f256c79e24 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Extensions/IServiceCollectionExtensions.cs
@@ -8,7 +8,7 @@ public static IServiceCollection AddSharedServices(this IServiceCollection servi
     {
         // Services being registered here can get injected everywhere (Api, Web, Android, iOS, Windows, macOS and Linux)
 
-        services.AddSingleton<IDateTimeProvider, DateTimeProvider>();
+        services.AddTransient<IDateTimeProvider, DateTimeProvider>();
 
         return services;
     }
diff --git a/src/Websites/Platform/src/Directory.Build.props b/src/Websites/Platform/src/Directory.Build.props
index bd74d59cc9..8c929067ba 100644
--- a/src/Websites/Platform/src/Directory.Build.props
+++ b/src/Websites/Platform/src/Directory.Build.props
@@ -1,11 +1,11 @@
 <!-- Generated by bit-dual template v-8.1.0-pre-02 -->
 <Project>
     <PropertyGroup>
-        <Nullable>enable</Nullable>
+        <LangVersion>12.0</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <Nullable>enable</Nullable>
         <NoWarn>$(NoWarn);CS1998;CS1591</NoWarn>
-        <LangVersion>12.0</LangVersion>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>
 
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
index b41f1e8f80..cae7069502 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
@@ -2,8 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
         <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
         <InvariantGlobalization>true</InvariantGlobalization>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/JsRuntimeExtension.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IJSRuntimeExtension.cs
similarity index 93%
rename from src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/JsRuntimeExtension.cs
rename to src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IJSRuntimeExtension.cs
index ba3ef05735..198966fcd7 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Extensions/JsRuntimeExtension.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IJSRuntimeExtension.cs
@@ -1,6 +1,6 @@
 namespace Microsoft.JSInterop;
 
-public static class JSRuntimeExtension
+public static class IJSRuntimeExtensions
 {
     public static async Task ToggleBodyOverflow(this IJSRuntime jsRuntime, bool isNavOpen)
     {
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IListExtensions.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IListExtensions.cs
index 8f50eb4679..d69651c4e8 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IListExtensions.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IListExtensions.cs
@@ -1,6 +1,6 @@
 namespace System.Collections.Generic;
 
-public static class IListExtensions
+public static class ICollectionExtensions
 {
     // Basically a Polyfill since we now expose IList instead of List
     // which is better but IList doesn't have AddRange
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IServiceCollectionExtensions.cs
index 7eec73e901..4b3bcefc29 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Extensions/IServiceCollectionExtensions.cs
@@ -8,16 +8,17 @@ public static IServiceCollection AddClientSharedServices(this IServiceCollection
     {
         services.AddSharedServices();
 
-        services.AddScoped<IPrerenderStateService, PrerenderStateService>();
-        services.AddScoped<IExceptionHandler, ExceptionHandler>();
+        services.AddTransient<IPrerenderStateService, PrerenderStateService>();
+        services.AddTransient<IExceptionHandler, ExceptionHandler>();
         services.AddScoped<IPubSubService, PubSubService>();
         services.AddBitBlazorUIServices();
 
+        services.AddTransient<RequestHeadersDelegationHandler>();
         services.AddTransient<RetryDelegatingHandler>();
         services.AddTransient<ExceptionDelegatingHandler>();
         services.AddTransient<HttpClientHandler>();
 
-        services.AddScoped<MessageBoxService>();
+        services.AddTransient<MessageBoxService>();
 
         return services;
     }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/AboutPage.razor b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/AboutPage.razor
index a8af969783..1f57b01b2f 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/AboutPage.razor
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/AboutPage.razor
@@ -13,8 +13,8 @@
         <div class="sec-body">
             <div class="sec-title">Evolve with bit</div>
             <div class="sec-desc">
-                We are a comprehensive software development agency, providing a wide range of software and cloud-based solutions to meet your needs. 
-                Whether you want to update your existing products or services or transform your business using the world’s leading technologies, 
+                We are a comprehensive software development agency, providing a wide range of software and cloud-based solutions to meet your needs.
+                Whether you want to update your existing products or services or transform your business using the world’s leading technologies,
                 we can help you achieve your goals. We are dedicated to providing the right solutions to help you succeed in today's digital landscape.
             </div>
         </div>
@@ -28,7 +28,7 @@
         <div class="guarantee-card guarantee-card-1">
             <div class="guarantee-card-title">Customer First</div>
             <div class="guarantee-card-desc">
-                Offering world-class support throughout the entire process. From consultation to ongoing technical support, 
+                Offering world-class support throughout the entire process. From consultation to ongoing technical support,
                 we're dedicated to achieving your business goals and delivering a positive experience.
             </div>
         </div>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/HomePage.razor b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/HomePage.razor
index a87dcb1be7..09c88fb824 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/HomePage.razor
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/HomePage.razor
@@ -10,7 +10,7 @@
             <div class="sec-title">To the Moon</div>
             <div class="sec-subtitle">Through the Clouds</div>
             <div class="sec-desc">
-                bit is a digital innovation company with software development at its core. We help out our customers innovate with designing 
+                bit is a digital innovation company with software development at its core. We help out our customers innovate with designing
                 and building their digital products efficiently with our Agile mindset and lean processes.
             </div>
             <a class="sec-btn--primary" href="/cases">See Our Showcases</a>
@@ -23,7 +23,7 @@
     <div class="sec-title">WHAT WE OFFER</div>
     <div class="sec-title-underline"></div>
     <div class="sec-content">
-        At bit, we are experts in providing a wide range of software development services. Whether you're unsure of which service best suits your needs, 
+        At bit, we are experts in providing a wide range of software development services. Whether you're unsure of which service best suits your needs,
         our team is here to help. Schedule a free online consultation with us today to get started.
     </div>
     <div class="sec-card-group">
@@ -43,13 +43,13 @@
     <div class="sec-title">HOW WE WORK</div>
     <div class="sec-title-underline"></div>
     <div class="sec-content">
-        Our team at bit is dedicated to delivering cutting-edge technology solutions through the implementation of best practices 
+        Our team at bit is dedicated to delivering cutting-edge technology solutions through the implementation of best practices
         and methodologies for rapid, efficient results in a structured and methodical way.
     </div>
     <div class="process-card process-card-1">
         <div class="process-card-title">Discovery</div>
         <div class="process-card-desc">
-            This phase ensures a successful outcome by gathering and analyzing data, conducting research, and identifying project scope, 
+            This phase ensures a successful outcome by gathering and analyzing data, conducting research, and identifying project scope,
             timelines, and budget. It leads to a clear project plan that aligns with the clients' business needs, goals and objectives.
         </div>
         <div class="process-card-number"></div>
@@ -57,7 +57,7 @@
     <div class="process-card process-card-2">
         <div class="process-card-title">Product Design</div>
         <div class="process-card-desc">
-            Transforming ideas into tangible, user-centered solutions that deliver an optimal experience. Through iterative testing 
+            Transforming ideas into tangible, user-centered solutions that deliver an optimal experience. Through iterative testing
             and validation, we ensure the final design exceeds expectations.
         </div>
         <div class="process-card-number"></div>
@@ -65,7 +65,7 @@
     <div class="process-card process-card-3">
         <div class="process-card-title">Setting Up Your Team</div>
         <div class="process-card-desc">
-            A dedicated, talented, and exclusive team is set up for the project. The team composition can be chosen based 
+            A dedicated, talented, and exclusive team is set up for the project. The team composition can be chosen based
             on budget and deadlines are established.
         </div>
         <div class="process-card-number"></div>
@@ -73,7 +73,7 @@
     <div class="process-card process-card-4">
         <div class="process-card-title">Agile Software Development</div>
         <div class="process-card-desc">
-            At bit, we assemble dedicated teams of experts, tailored to your specific project needs and budget. We handpick the 
+            At bit, we assemble dedicated teams of experts, tailored to your specific project needs and budget. We handpick the
             right team members to ensure successful delivery and set clear deadlines for completion.
         </div>
         <div class="process-card-number"></div>
@@ -81,7 +81,7 @@
     <div class="process-card process-card-5">
         <div class="process-card-title">Technical Support</div>
         <div class="process-card-desc">
-            bit provides comprehensive support for your software, including technical assistance, SEO, performance monitoring, 
+            bit provides comprehensive support for your software, including technical assistance, SEO, performance monitoring,
             upgrades, and maintenance to ensure its success in the market.
         </div>
         <div class="process-card-number"></div>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/ServicesPage.razor b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/ServicesPage.razor
index 29ba41e4c6..bbcfedc89a 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/ServicesPage.razor
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Pages/ServicesPage.razor
@@ -13,7 +13,7 @@
         <div class="sec-body">
             <div class="sec-title">Outsource your Concerns<br />in Software Development Services</div>
             <div class="sec-desc">
-                With focus on cost-efficiency and agile development, we can help you scale up your business, achieve your goals and integrate 
+                With focus on cost-efficiency and agile development, we can help you scale up your business, achieve your goals and integrate
                 e-commerce as soon as possible. bit foundation works round the clock and tirelessly to make sure we deliver more than you expect.
             </div>
         </div>
@@ -23,7 +23,7 @@
 <section class="page-sec outsourcing">
     <div class="sec-title">Full-service business process outsourcing</div>
     <div class="sec-desc">
-        At bit, we empower businesses to reach their full potential by providing cutting-edge services that streamline operations 
+        At bit, we empower businesses to reach their full potential by providing cutting-edge services that streamline operations
         and allow them to focus on their core competencies.
     </div>
     <div class="sec-content">
@@ -32,16 +32,16 @@
             <div class="step">
                 <div class="step-title">Product Design</div>
                 <div class="step-desc">
-                    Your idea deserves an impeccable future, so do you. The art of product design is not just in creating a beautifully 
-                    crafted product but to truly understand your user needs and empathize with them. But what makes this idea even more 
+                    Your idea deserves an impeccable future, so do you. The art of product design is not just in creating a beautifully
+                    crafted product but to truly understand your user needs and empathize with them. But what makes this idea even more
                     brilliant is to execute it cost-effectively and in the shortest time possible.
                 </div>
             </div>
             <div class="step">
                 <div class="step-title">Dedicated Team of Experts</div>
                 <div class="step-desc">
-                    Let us boom your business through the power of people. We are more than lucky to have only the best of the 
-                    best by our side. Whether you're launching a startup or working on further growth of your scaleup, we make 
+                    Let us boom your business through the power of people. We are more than lucky to have only the best of the
+                    best by our side. Whether you're launching a startup or working on further growth of your scaleup, we make
                     sure the right experts are assigned to your specific needs.
                     <br />
                     <a href="/process#art">see all roles in a team</a>
@@ -50,14 +50,14 @@
             <div class="step" id="solutions">
                 <div class="step-title">Modern Solutions</div>
                 <div class="step-desc">
-                    Utilizing cutting-edge technologies throughout your business growth process is an absolute must. With the right 
+                    Utilizing cutting-edge technologies throughout your business growth process is an absolute must. With the right
                     technologies that fit your business needs, your business will be swift and efficient in ways never before possible.
                 </div>
                 <div class="solutions-container">
                     <ProcessAccordion Title="Web development">
                         <div>
-                            Your business is unique and must be run on a unique platform. We offer custom web development for your business. 
-                            We make sure that your website is responsive and works perfectly and beautifully on tablet, desktop and smartphone 
+                            Your business is unique and must be run on a unique platform. We offer custom web development for your business.
+                            We make sure that your website is responsive and works perfectly and beautifully on tablet, desktop and smartphone
                             browsers. Our team specializes in making great custom-made websites.
                         </div>
                         <div class="tags">
@@ -71,8 +71,8 @@
                     </ProcessAccordion>
                     <ProcessAccordion Title="Mobile development">
                         <div>
-                            Unlock the full potential of your business with our world-class mobile development services. 
-                            Our team of experts will work with you to design, develop, and deliver custom mobile solutions 
+                            Unlock the full potential of your business with our world-class mobile development services.
+                            Our team of experts will work with you to design, develop, and deliver custom mobile solutions
                             that drive engagement and increase revenue.
                         </div>
                         <div class="tags">
@@ -85,8 +85,8 @@
                     </ProcessAccordion>
                     <ProcessAccordion Title="Consultant">
                         <div>
-                            Our consulting services are tailored to meet the unique needs of your business. 
-                            Our experts work with you to understand your goals and provide strategies and solutions to help you achieve them. 
+                            Our consulting services are tailored to meet the unique needs of your business.
+                            Our experts work with you to understand your goals and provide strategies and solutions to help you achieve them.
                             From technology selection to implementation and optimization, we've got you covered.
                         </div>
                         <div class="tags">
@@ -99,9 +99,9 @@
                     </ProcessAccordion>
                     <ProcessAccordion Title="Artificial Intelligence">
                         <div>
-                            At bit, we leverage the power of artificial intelligence to help businesses gain a competitive edge. 
-                            From data analysis and prediction to automation and natural language processing, 
-                            our AI services can help you transform your operations, optimize your processes, and drive innovation. 
+                            At bit, we leverage the power of artificial intelligence to help businesses gain a competitive edge.
+                            From data analysis and prediction to automation and natural language processing,
+                            our AI services can help you transform your operations, optimize your processes, and drive innovation.
                             Trust our team of experts to design and implement cutting-edge AI solutions that meet your unique needs and goals.
                         </div>
                         <div class="tags">
@@ -112,8 +112,8 @@
                     </ProcessAccordion>
                     <ProcessAccordion Title="UI/UX Design">
                         <div>
-                            Our team of experts specializes in creating intuitive and user-friendly interfaces to enhance your 
-                            user experience. We work closely with our clients to understand their specific needs and design 
+                            Our team of experts specializes in creating intuitive and user-friendly interfaces to enhance your
+                            user experience. We work closely with our clients to understand their specific needs and design
                             solutions that are both visually appealing and easy to navigate.
                         </div>
                         <div class="tags">
@@ -125,8 +125,8 @@
                     </ProcessAccordion>
                     <ProcessAccordion Title="Technical Support">
                         <div>
-                            Our technical support team is available 24/7 to ensure that your software runs smoothly 
-                            and any issues are resolved quickly. Our experts are well-versed in the latest technologies 
+                            Our technical support team is available 24/7 to ensure that your software runs smoothly
+                            and any issues are resolved quickly. Our experts are well-versed in the latest technologies
                             and can provide comprehensive maintenance and troubleshooting services.
                         </div>
                         <div class="tags">
@@ -137,8 +137,8 @@
                     </ProcessAccordion>
                     <ProcessAccordion Title="Cloud Base Solutions">
                         <div>
-                            Our cloud-based solutions are designed to help your business scale up and stay ahead of the competition. 
-                            We provide a range of services such as cloud migration, cloud consulting, and cloud management to help 
+                            Our cloud-based solutions are designed to help your business scale up and stay ahead of the competition.
+                            We provide a range of services such as cloud migration, cloud consulting, and cloud management to help
                             you take full advantage of the benefits of cloud computing.
                         </div>
                         <div class="tags">
@@ -149,8 +149,8 @@
                     </ProcessAccordion>
                     <ProcessAccordion Title="Game Development">
                         <div>
-                            We have a team of experienced game developers who are passionate about creating engaging 
-                            and immersive gaming experiences. We specialize in developing games for a variety of platforms 
+                            We have a team of experienced game developers who are passionate about creating engaging
+                            and immersive gaming experiences. We specialize in developing games for a variety of platforms
                             such as PC, mobile, and console, and can help bring your game development project to life.
                         </div>
                         <div class="tags">
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Program.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Program.cs
index bbc82b2474..519bfac5c4 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Program.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Program.cs
@@ -13,7 +13,6 @@
 }
 
 builder.Services.AddSingleton(sp => new HttpClient(sp.GetRequiredService<RetryDelegatingHandler>()) { BaseAddress = apiServerAddress });
-builder.Services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();
 
 builder.Services.AddClientSharedServices();
 
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Routes.razor b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Routes.razor
index 870dd6af21..0b367f2be3 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Routes.razor
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Routes.razor
@@ -1,6 +1,5 @@
 <LayoutView Layout="@typeof(MainLayout)">
-    <Router AppAssembly="@GetType().Assembly"
-            OnNavigateAsync="@OnNavigateAsync">
+    <Router AppAssembly="@GetType().Assembly">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" />
         </Found>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Routes.razor.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Routes.razor.cs
index 12d1d5b477..961df074a3 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Routes.razor.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Routes.razor.cs
@@ -4,18 +4,4 @@ namespace Bit.Websites.Sales.Client;
 
 public partial class Routes
 {
-    private List<System.Reflection.Assembly> _lazyLoadedAssemblies = [];
-    [AutoInject] private Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader _assemblyLoader = default!;
-
-    private async Task OnNavigateAsync(NavigationContext args)
-    {
-        if (OperatingSystem.IsBrowser())
-        {
-            if ((args.Path is "dashboard") && _lazyLoadedAssemblies.Any(asm => asm.GetName().Name == "Newtonsoft.Json") is false)
-            {
-                var assemblies = await _assemblyLoader.LoadAssembliesAsync(["Newtonsoft.Json.wasm", "System.Private.Xml.wasm", "System.Data.Common.wasm"]);
-                _lazyLoadedAssemblies.AddRange(assemblies);
-            }
-        }
-    }
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Scripts/app.ts b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Scripts/app.ts
index 98296c57d3..ac51fa6461 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Scripts/app.ts
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Scripts/app.ts
@@ -1,23 +1,4 @@
 class App {
-    public static setCookie(name: string, value: string, seconds: number) {
-        const date = new Date();
-        date.setSeconds(date.getSeconds() + seconds);
-        document.cookie = `${name}=${value};expires=${date.toUTCString()};path=/`;
-    }
-
-    public static getCookie(name: string) {
-        const cookies = document.cookie.split(';');
-        for (let i = 0; i < cookies.length; i++) {
-            const cookie = cookies[i].split('=');
-            if (App.trim(cookie[0]) == escape(name)) {
-                return unescape(App.trim(cookie[1]));
-            }
-        }
-    }
-
-    public static removeCookie(name: string) {
-        document.cookie = `${name}=; Max-Age=0`;
-    }
 
     public static goBack() {
         window.history.back();
@@ -27,10 +8,6 @@
         location.reload();
     }
 
-    private static trim(value: string) {
-        return value.replace(/^\s+|\s+$/g, '');
-    }
-
     public static setBodyStyle(value: string) {
         document.body.setAttribute('style', value);
     }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/Contracts/IPubSubService.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/Contracts/IPubSubService.cs
index 2fcbba92dd..a1eff035a7 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/Contracts/IPubSubService.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/Contracts/IPubSubService.cs
@@ -6,5 +6,5 @@
 public interface IPubSubService
 {
     void Publish(string message, object? payload);
-    Action Subscribe(string message, Action<object?> handler);
+    Action Subscribe(string message, Func<object?, Task> handler);
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
index 7c880fa49e..2648370e5c 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
@@ -2,20 +2,9 @@
 
 namespace Bit.Websites.Sales.Client.Services.HttpMessageHandlers;
 
-public class ExceptionDelegatingHandler
-    : DelegatingHandler
+public class ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
+    : DelegatingHandler(httpClientHandler)
 {
-    public ExceptionDelegatingHandler(HttpClientHandler httpClientHandler)
-        : base(httpClientHandler)
-    {
-
-    }
-
-    public ExceptionDelegatingHandler()
-    {
-
-    }
-
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         bool serverCommunicationSuccess = false;
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
new file mode 100644
index 0000000000..406321d3c9
--- /dev/null
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/RequestHeadersDelegationHandler.cs
@@ -0,0 +1,15 @@
+using Microsoft.AspNetCore.Components.WebAssembly.Http;
+
+namespace Bit.Websites.Sales.Client.Services.HttpMessageHandlers;
+
+public class RequestHeadersDelegationHandler(RetryDelegatingHandler handler)
+    : DelegatingHandler(handler)
+{
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        request.SetBrowserResponseStreamingEnabled(true);
+
+        return await base.SendAsync(request, cancellationToken);
+    }
+}
+
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
index 6ad709c7c0..96562442a6 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
@@ -1,18 +1,8 @@
 namespace Bit.Websites.Sales.Client.Services.HttpMessageHandlers;
 
-public class RetryDelegatingHandler
-    : DelegatingHandler
+public class RetryDelegatingHandler(ExceptionDelegatingHandler handler)
+    : DelegatingHandler(handler)
 {
-    public RetryDelegatingHandler(ExceptionDelegatingHandler handler)
-        : base(handler)
-    {
-
-    }
-
-    public RetryDelegatingHandler()
-    {
-
-    }
 
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/PrerenderStateService.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/PrerenderStateService.cs
index d4ed1f75b3..46af4b2c18 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/PrerenderStateService.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/PrerenderStateService.cs
@@ -1,6 +1,4 @@
 
-using Microsoft.AspNetCore.Components.Web;
-
 namespace Bit.Websites.Sales.Client.Services;
 
 // Using this class, persisting the application state on Pre-Rendering mode (explained here: https://docs.microsoft.com/en-us/aspnet/core/blazor/components/prerendering-and-integration#persist-prerendered-state) will be very simple in this multi-mode Template project.
@@ -14,11 +12,7 @@ public class PrerenderStateService : IPrerenderStateService, IAsyncDisposable
     public PrerenderStateService(PersistentComponentState applicationState)
     {
         _applicationState = applicationState;
-
-        if (OperatingSystem.IsBrowser() is false)
-        {
-            _subscription = applicationState.RegisterOnPersisting(PersistAsJson, RenderModeProvider.Current);
-        }
+        _subscription = applicationState.RegisterOnPersisting(PersistAsJson, RenderModeProvider.Current);
     }
 
     public async Task<T?> GetValue<T>(string key, Func<Task<T?>> factory)
@@ -32,8 +26,6 @@ public PrerenderStateService(PersistentComponentState applicationState)
 
     void Persist<T>(string key, T value)
     {
-        if (OperatingSystem.IsBrowser())
-            return;
         _values.TryRemove(key, out object? _);
         _values.TryAdd(key, value);
     }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/PubSubService.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/PubSubService.cs
index b21204247a..60c2114c98 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/PubSubService.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/PubSubService.cs
@@ -3,19 +3,25 @@
 /// <summary>
 /// For more information <see cref="IPubSubService"/> docs.
 /// </summary>
-public class PubSubService : IPubSubService
+public partial class PubSubService : IPubSubService
 {
-    private readonly ConcurrentDictionary<string, List<Action<object?>>> _handlers = new();
+    [AutoInject] private IServiceProvider _serviceProvider = default!;
+
+    private readonly ConcurrentDictionary<string, List<Func<object?, Task>>> _handlers = new();
 
     public void Publish(string message, object? payload)
     {
         if (_handlers.TryGetValue(message, out var handlers))
         {
-            handlers.ForEach(handler => handler(payload));
+            foreach (var handler in handlers)
+            {
+                handler(payload)
+                    .ContinueWith(t => _serviceProvider.GetRequiredService<IExceptionHandler>().Handle(t.Exception!), TaskContinuationOptions.OnlyOnFaulted);
+            }
         }
     }
 
-    public Action Subscribe(string message, Action<object?> handler)
+    public Action Subscribe(string message, Func<object?, Task> handler)
     {
         var handlers = _handlers.ContainsKey(message)
                             ? _handlers[message]
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/RenderModeProvider.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/RenderModeProvider.cs
index 163e286c18..c9adc543cc 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/RenderModeProvider.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Services/RenderModeProvider.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Components.Web;
+//-:cnd:noEmit
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Bit.Websites.Sales.Client.Services;
 
@@ -14,5 +15,10 @@ public static class RenderModeProvider
 
     // PrerenderOnly: In order to have prerender only mode, simply remove @rendermode usages from App.razor
 
-    public static IComponentRenderMode Current => PrerenderEnabledAuto;
+    public static IComponentRenderMode Current =>
+#if DEBUG
+    PrerenderEnabledBlazorServer; // Or BlazorServer, for better development experience.
+#else
+    PrerenderEnabledAuto;
+#endif
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/AppComponentBase.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/AppComponentBase.cs
index d46ee2c1d5..46061ea56c 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/AppComponentBase.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/AppComponentBase.cs
@@ -20,7 +20,7 @@ public partial class AppComponentBase : ComponentBase
 
     [AutoInject] protected NavigationManager NavigationManager = default!;
 
-    [AutoInject] protected IExceptionHandler ExceptionHandler { get; set; } = default!;
+    [AutoInject] protected IExceptionHandler ExceptionHandler = default!;
 
     protected sealed override async Task OnInitializedAsync()
     {
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/ChangePrerenderResponseStatusCode.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/ChangePrerenderResponseStatusCode.cs
deleted file mode 100644
index c5441adfdd..0000000000
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/ChangePrerenderResponseStatusCode.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Net;
-
-namespace Bit.Websites.Sales.Client.Shared;
-
-/// <summary>
-/// This component is used during prerendering to determine the value of the StatusCode parameter for the returned HTTP response.
-/// </summary>
-public partial class ChangePrerenderResponseStatusCode : AppComponentBase
-{
-    [Parameter]
-    public HttpStatusCode StatusCode { get; set; }
-
-    private static readonly Type? _httpContextAccessorType = Type.GetType("Microsoft.AspNetCore.Http.IHttpContextAccessor, Microsoft.AspNetCore.Http.Abstractions");
-
-    [AutoInject]
-    public IServiceProvider _serviceProvider = default!;
-
-    protected override Task OnInitAsync()
-    {
-        if (_httpContextAccessorType is not null)
-        {
-            var httpContextAccessor = _serviceProvider.GetService(_httpContextAccessorType);
-
-            var httpContextProperty = _httpContextAccessorType.GetProperty("HttpContext")!;
-
-            var httpContext = httpContextProperty.GetValue(httpContextAccessor)!;
-
-            var response = httpContext.GetType().GetProperty("Response")!.GetValue(httpContext)!;
-
-            response.GetType().GetProperty("StatusCode")!.SetValue(response, (int)StatusCode);
-        }
-
-        return base.OnInitAsync();
-    }
-}
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/MainLayout.razor.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/MainLayout.razor.cs
index 646c91d553..e00ecfdd35 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/MainLayout.razor.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/MainLayout.razor.cs
@@ -2,7 +2,7 @@
 
 public partial class MainLayout
 {
-    [AutoInject] private IExceptionHandler exceptionHandler = default!;
+    [AutoInject] private IExceptionHandler _exceptionHandler = default!;
 
     protected override void OnParametersSet()
     {
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/PageNotFound.razor.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/PageNotFound.razor.cs
index 466473a6f6..5177831114 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/PageNotFound.razor.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Shared/PageNotFound.razor.cs
@@ -2,10 +2,10 @@
 
 public partial class PageNotFound
 {
-    [AutoInject] public NavigationManager NavigationManager { get; set; }
+    [AutoInject] private NavigationManager _navigationManager = default!;
 
     private void BackToHome()
     {
-        NavigationManager.NavigateTo("/");
+        _navigationManager.NavigateTo("/");
     }
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/appsettings.json b/src/Websites/Sales/src/Bit.Websites.Sales.Client/appsettings.json
index 423ad00545..84ec89dc0f 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/appsettings.json
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/appsettings.json
@@ -1,12 +1,3 @@
 {
-    "DetailedErrors": true,
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "AllowedHosts": "*",
     "ApiServerAddress": "api/" // You can also use absolute urls such as http://192.168.1.150:5000/api/ or https://todob.bitplatform.dev/api/
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/compilerconfig.json b/src/Websites/Sales/src/Bit.Websites.Sales.Client/compilerconfig.json
index 188383723c..6ba9e70c24 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/compilerconfig.json
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/compilerconfig.json
@@ -6,20 +6,20 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/ShowCaseDetailPage.razor.css",
-        "inputFile": "Pages/ShowCaseDetailPage.razor.scss",
+        "outputFile": "Pages/ProcessAccordion.razor.css",
+        "inputFile": "Pages/ProcessAccordion.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/ServicesPage.razor.css",
-        "inputFile": "Pages/ServicesPage.razor.scss",
+        "outputFile": "Pages/AboutPage.razor.css",
+        "inputFile": "Pages/AboutPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/YourTeamPage.razor.css",
-        "inputFile": "Pages/YourTeamPage.razor.scss",
+        "outputFile": "Pages/CasesPage.razor.css",
+        "inputFile": "Pages/CasesPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
@@ -30,62 +30,62 @@
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Pages/AboutPage.razor.css",
-        "inputFile": "Pages/AboutPage.razor.scss",
+        "outputFile": "Pages/ServicesPage.razor.css",
+        "inputFile": "Pages/ServicesPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Components/Case.razor.css",
-        "inputFile": "Components/Case.razor.scss",
+        "outputFile": "Components/ShowCaseDetailPage.razor.css",
+        "inputFile": "Components/ShowCaseDetailPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/ContactForm.razor.css",
-        "inputFile": "Shared/ContactForm.razor.scss",
+        "outputFile": "Shared/YourTeamPage.razor.css",
+        "inputFile": "Shared/YourTeamPage.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Header.razor.css",
-        "inputFile": "Shared/Header.razor.scss",
+        "outputFile": "Shared/AppErrorBoundary.razor.css",
+        "inputFile": "Shared/AppErrorBoundary.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/MainLayout.razor.css",
-        "inputFile": "Shared/MainLayout.razor.scss",
+        "outputFile": "Shared/ContactForm.razor.css",
+        "inputFile": "Shared/ContactForm.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/MessageBox.razor.css",
-        "inputFile": "Shared/MessageBox.razor.scss",
+        "outputFile": "Shared/Footer.razor.css",
+        "inputFile": "Shared/Footer.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/AppErrorBoundary.razor.css",
-        "inputFile": "Shared/AppErrorBoundary.razor.scss",
+        "outputFile": "Shared/Header.razor.css",
+        "inputFile": "Shared/Header.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/Footer.razor.css",
-        "inputFile": "Shared/Footer.razor.scss",
+        "outputFile": "Shared/LoadingComponent.razor.css",
+        "inputFile": "Shared/LoadingComponent.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Shared/LoadingComponent.razor.css",
-        "inputFile": "Shared/LoadingComponent.razor.scss",
+        "outputFile": "Shared/MainLayout.razor.css",
+        "inputFile": "Shared/MainLayout.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
     {
-        "outputFile": "Components/ProcessAccordion.razor.css",
-        "inputFile": "Components/ProcessAccordion.razor.scss",
+        "outputFile": "Components/MessageBox.razor.css",
+        "inputFile": "Components/MessageBox.razor.scss",
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
index 86e96664ae..1353d877a7 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
@@ -2,8 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Components/App.razor b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Components/App.razor
index ad2b0d3ef6..fcb2e6789c 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Components/App.razor
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Components/App.razor
@@ -9,15 +9,6 @@
     <meta name="theme-color">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="bit is a digital innovation company with software development at its core. We help out our customers innovate with designing and building their digital products efficiently with our Agile mindset and lean processes." />
-    <!-- Google Tag Manager -->
-@*     <script>
-        (function (w, d, s, l, i) {
-            w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
-            var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
-            j.async = true; j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
-        })(window, document, 'script', 'dataLayer', 'GTM-NFPRLK6B');
-    </script> *@
-    <!-- End Google Tag Manager -->
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
     <HeadOutlet @rendermode=RenderModeProvider.Current />
     <link rel="apple-touch-icon" sizes="512x512" href="images/icons/bit-icon-512.png" />
@@ -51,16 +42,6 @@
 
 <body>
 
-    <!-- Microsoft Clarity -->
-@*     <script type="text/javascript">
-        (function (c, l, a, r, i, t, y) {
-            c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments) };
-            t = l.createElement(r); t.async = 1; t.src = "https://www.clarity.ms/tag/" + i;
-            y = l.getElementsByTagName(r)[0]; y.parentNode.insertBefore(t, y);
-        })(window, document, "clarity", "script", "ip2k0jz1zu");
-    </script> *@
-    <!-- Microsoft Clarity -->
-
     <Routes @rendermode=RenderModeProvider.Current />
 
     @if (HttpContext.Request.IsCrawlerClient() is false)
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Controllers/ContactUsController.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Controllers/ContactUsController.cs
index 8454a2b87d..e4cf875401 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Controllers/ContactUsController.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Controllers/ContactUsController.cs
@@ -7,12 +7,12 @@ namespace Bit.Websites.Sales.Server.Controllers;
 [ApiController]
 public partial class ContactUsController : AppControllerBase
 {
-    [AutoInject] protected TelegramBotService TelegramBotService = default!;
+    [AutoInject] private TelegramBotService _telegramBotService = default!;
 
     [HttpPost]
     public async Task<IActionResult> SendMessage(ContactUsDto contactUsDto, CancellationToken cancellationToken)
     {
-        await TelegramBotService.SendContactUsMessage(contactUsDto.Email, contactUsDto.Name, contactUsDto.Information, cancellationToken);
+        await _telegramBotService.SendContactUsMessage(contactUsDto.Email, contactUsDto.Name, contactUsDto.Information, cancellationToken);
         return Ok();
     }
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Extensions/IServiceCollectionExtensions.cs
index ecf0a574ef..f76b35fd83 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Extensions/IServiceCollectionExtensions.cs
@@ -9,32 +9,20 @@ public static class IServiceCollectionExtensions
 {
     public static void AddBlazor(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddScoped(sp =>
+        services.AddTransient(sp =>
         {
-            IHttpClientFactory httpClientFactory = sp.GetRequiredService<IHttpClientFactory>();
-            return httpClientFactory.CreateClient("BlazorHttpClient");
-            // This registers HttpClient for pre rendering & blazor server only, so to use http client to call 3rd party apis and other use cases,
-            // either use services.AddHttpClient("NamedHttpClient") or services.AddHttpClient<TypedHttpClient>();
-        });
+            Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
 
-        // In the Pre-Rendering mode, the configured HttpClient will use the access_token provided by the cookie in the request, so the pre-rendered content would be fitting for the current user.
-        services.AddHttpClient("BlazorHttpClient")
-            .AddHttpMessageHandler(sp => new RetryDelegatingHandler())
-            .AddHttpMessageHandler(sp => new ExceptionDelegatingHandler())
-            .ConfigurePrimaryHttpMessageHandler<HttpClientHandler>()
-            .ConfigureHttpClient((sp, httpClient) =>
+            if (apiServerAddress!.IsAbsoluteUri is false)
             {
-                Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
-
-                if (apiServerAddress!.IsAbsoluteUri is false)
-                {
-                    apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
-                }
-
-                httpClient.BaseAddress = apiServerAddress;
-            });
+                apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
+            }
 
-        services.AddScoped<LazyAssemblyLoader>();
+            return new HttpClient(sp.GetRequiredService<RequestHeadersDelegationHandler>())
+            {
+                BaseAddress = apiServerAddress
+            };
+        });
 
         services.AddRazorComponents()
             .AddInteractiveServerComponents()
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Services/TelegramBotApiClient.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Services/TelegramBotApiClient.cs
index 3a7994d8ae..b35eb5c91f 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Services/TelegramBotApiClient.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Services/TelegramBotApiClient.cs
@@ -7,17 +7,17 @@ public partial class TelegramBotApiClient
 {
     private const int MAX_LENGTH_MESSAGE = 4096;
 
-    [AutoInject] protected HttpClient HttpClient = default!;
-    [AutoInject] protected IOptionsSnapshot<AppSettings> AppSettings = default!;
+    [AutoInject] private HttpClient _httpClient = default!;
+    [AutoInject] private AppSettings _appSettings = default!;
 
     public async Task SendMessageAsync(string message, CancellationToken cancellationToken)
     {
-        if (string.IsNullOrEmpty(AppSettings.Value.TelegramBotSettings.Token) || AppSettings.Value.TelegramBotSettings.ChatIds.Length < 1 || string.IsNullOrEmpty(message))
+        if (string.IsNullOrEmpty(_appSettings.TelegramBotSettings.Token) || _appSettings.TelegramBotSettings.ChatIds.Length < 1 || string.IsNullOrEmpty(message))
         {
             return;
         }
 
-        foreach (var chatId in AppSettings.Value.TelegramBotSettings.ChatIds)
+        foreach (var chatId in _appSettings.TelegramBotSettings.ChatIds)
         {
             if (cancellationToken.IsCancellationRequested)
             {
@@ -40,8 +40,8 @@ private async Task SendMessageAsync(string chatId, string message, CancellationT
             parse_mode = "Markdown"
         };
         var json = JsonSerializer.Serialize(value: payload);
-        var apiUrl = new Uri(uriString: $"https://api.telegram.org/bot{AppSettings.Value.TelegramBotSettings.Token}/sendMessage");
-        await HttpClient.PostAsync(requestUri: apiUrl,
+        var apiUrl = new Uri(uriString: $"https://api.telegram.org/bot{_appSettings.TelegramBotSettings.Token}/sendMessage");
+        await _httpClient.PostAsync(requestUri: apiUrl,
             content: new StringContent(content: json, encoding: Encoding.UTF8, mediaType: "application/json"), cancellationToken);
     }
 
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Services/TelegramBotService.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Services/TelegramBotService.cs
index bf8a32a210..98ad449869 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Services/TelegramBotService.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Services/TelegramBotService.cs
@@ -4,7 +4,7 @@ namespace Bit.Websites.Sales.Server.Services;
 
 public partial class TelegramBotService
 {
-    [AutoInject] protected TelegramBotApiClient TelegramBotApiClient = default!;
+    [AutoInject] private TelegramBotApiClient _telegramBotApiClient = default!;
 
     public async Task SendContactUsMessage(string? email, string? name, string? message, CancellationToken cancellationToken)
     {
@@ -14,6 +14,6 @@ public async Task SendContactUsMessage(string? email, string? name, string? mess
         messageBuilder.AppendLine(string.IsNullOrEmpty(name) ? $"📥 *Name:* `-`" : $"📥 *Name:* `{name.Trim()}`");
         messageBuilder.AppendLine($"📜 *Message*: {message}");
 
-        await TelegramBotApiClient.SendMessageAsync(messageBuilder.ToString(), cancellationToken);
+        await _telegramBotApiClient.SendMessageAsync(messageBuilder.ToString(), cancellationToken);
     }
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs
index e1716398d0..58ad72c43f 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs
@@ -4,6 +4,8 @@
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Net.Http.Headers;
 using Bit.Websites.Sales.Server.Components;
+using System.Net;
+using Microsoft.AspNetCore.Components.Endpoints;
 
 namespace Bit.Websites.Sales.Server.Startup;
 
@@ -23,22 +25,7 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
             app.UseResponseCompression();
         }
 
-        app.UseStatusCodePages(options: new()
-        {
-            HandleAsync = async (statusCodeContext) =>
-            {
-                var httpContext = statusCodeContext.HttpContext;
-
-                if (httpContext.Response.StatusCode is 404)
-                {
-                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
-                }
-                else if (httpContext.Response.StatusCode is 401)
-                {
-                    httpContext.Response.Redirect($"/not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
-                }
-            }
-        });
+        Configure_404_Page(app);
 
         app.UseStaticFiles(new StaticFileOptions
         {
@@ -82,4 +69,38 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
             .AddInteractiveWebAssemblyRenderMode()
             .AddAdditionalAssemblies(Assembly.Load("Bit.Websites.Sales.Client"));
     }
+
+    private static void Configure_404_Page(WebApplication app)
+    {
+        app.Use(async (context, next) =>
+        {
+            if (context.Request.Path.HasValue)
+            {
+                if (context.Request.Path.Value.Contains("not-found", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
+            }
+
+            await next.Invoke(context);
+        });
+
+        app.UseStatusCodePages(options: new()
+        {
+            HandleAsync = async (statusCodeContext) =>
+            {
+                var httpContext = statusCodeContext.HttpContext;
+
+                if (httpContext.Response.StatusCode is 404 &&
+                                    httpContext.GetEndpoint() is null /* Please be aware that certain endpoints, particularly those associated with web API actions, may intentionally return a 404 error. */)
+                {
+                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
+                }
+                else
+                {
+                    await statusCodeContext.Next.Invoke(statusCodeContext.HttpContext);
+                }
+            }
+        });
+    }
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Services.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Services.cs
index 2a0be13de5..a64cc577e6 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Services.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Services.cs
@@ -49,7 +49,7 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
 
         services.Configure<AppSettings>(configuration.GetSection(nameof(AppSettings)));
 
-        services.AddScoped(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
+        services.AddTransient(sp => sp.GetRequiredService<IOptionsSnapshot<AppSettings>>().Value);
 
         services.AddEndpointsApiExplorer();
 
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Extensions/IServiceCollectionExtensions.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Extensions/IServiceCollectionExtensions.cs
index ab66557fed..825a1c6389 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Extensions/IServiceCollectionExtensions.cs
@@ -8,7 +8,7 @@ public static IServiceCollection AddSharedServices(this IServiceCollection servi
     {
         // Services being registered here can get injected everywhere (Api, Web, Android, iOS, Windows, macOS and Linux)
 
-        services.AddSingleton<IDateTimeProvider, DateTimeProvider>();
+        services.AddTransient<IDateTimeProvider, DateTimeProvider>();
 
         return services;
     }
diff --git a/src/Websites/Sales/src/Directory.Build.props b/src/Websites/Sales/src/Directory.Build.props
index 99a40db256..0634dbda62 100644
--- a/src/Websites/Sales/src/Directory.Build.props
+++ b/src/Websites/Sales/src/Directory.Build.props
@@ -1,11 +1,11 @@
 <!-- Generated by bit-dual template v-8.1.0-pre-02 -->
 <Project>
     <PropertyGroup>
-        <Nullable>enable</Nullable>
+        <LangVersion>12.0</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <Nullable>enable</Nullable>
         <NoWarn>$(NoWarn);CS1998;CS1591</NoWarn>
-        <LangVersion>12.0</LangVersion>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>