diff --git a/src/Pixel.Identity.Provider/Areas/Identity/Pages/_Layout.cshtml b/src/Pixel.Identity.Provider/Areas/Identity/Pages/_Layout.cshtml
index d592711..16a64ff 100644
--- a/src/Pixel.Identity.Provider/Areas/Identity/Pages/_Layout.cshtml
+++ b/src/Pixel.Identity.Provider/Areas/Identity/Pages/_Layout.cshtml
@@ -25,7 +25,7 @@
     </div>      
     <script src="~/lib/jquery/jquery.min.js"></script>
     <script src="~/lib/twitter-bootstrap/js/bootstrap.bundle.min.js"></script>     
-    <script src="_framework/blazor.server.js"></script>
+    <script src="_framework/blazor.web.js"></script>
     <script src="_content/MudBlazor/MudBlazor.min.js"></script>
     @await RenderSectionAsync("Scripts", required:false)
 </body>
diff --git a/src/Pixel.Identity.Provider/Components/App.razor b/src/Pixel.Identity.Provider/Components/App.razor
new file mode 100644
index 0000000..983f1d4
--- /dev/null
+++ b/src/Pixel.Identity.Provider/Components/App.razor
@@ -0,0 +1,20 @@
+﻿<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="~/" />
+    <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
+    <link rel="stylesheet" href="app.css" />
+    <link rel="stylesheet" href="BlazorApp1.styles.css" />
+    <link rel="icon" type="image/png" href="favicon.png" />
+    <HeadOutlet />
+</head>
+
+<body>
+    <Routes />
+    <script src="_framework/blazor.web.js"></script>
+</body>
+
+</html>
diff --git a/src/Pixel.Identity.Provider/Components/Routes.razor b/src/Pixel.Identity.Provider/Components/Routes.razor
new file mode 100644
index 0000000..de8953c
--- /dev/null
+++ b/src/Pixel.Identity.Provider/Components/Routes.razor
@@ -0,0 +1,9 @@
+﻿<Router AppAssembly="typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)" />
+        <FocusOnNavigate RouteData="routeData" Selector="h1" />
+    </Found>
+    <NotFound>
+        <p>Not found</p>
+    </NotFound>
+</Router>
diff --git a/src/Pixel.Identity.Provider/Startup.cs b/src/Pixel.Identity.Provider/Startup.cs
index d5457fa..8cc83ed 100644
--- a/src/Pixel.Identity.Provider/Startup.cs
+++ b/src/Pixel.Identity.Provider/Startup.cs
@@ -9,6 +9,7 @@
 using MudBlazor.Services;
 using Pixel.Identity.Core;
 using Pixel.Identity.Core.Plugins;
+using Pixel.Identity.Provider.Components;
 using Pixel.Identity.Provider.Extensions;
 using Pixel.Identity.Shared;
 using Quartz;
@@ -63,7 +64,7 @@ public void ConfigureServices(IServiceCollection services)
                     options.Conventions.AuthorizeAreaPage("Identity", "/Account/Register", Policies.CanManageUsers);
                 }
             });
-            services.AddServerSideBlazor();
+            services.AddRazorComponents();
             services.AddSwaggerGen(c =>
             {
                 c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
@@ -146,12 +147,15 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseAuthentication();
             app.UseAuthorization();
+            app.UseAntiforgery();
 
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapRazorPages();
                 endpoints.MapControllers();
+                endpoints.MapRazorComponents<App>();               
                 endpoints.MapFallbackToFile("index.html");
+               
             });
         }      
 
diff --git a/src/Pixel.Identity.Provider/Views/Shared/_Layout.cshtml b/src/Pixel.Identity.Provider/Views/Shared/_Layout.cshtml
index d5f6e80..d7d7f56 100644
--- a/src/Pixel.Identity.Provider/Views/Shared/_Layout.cshtml
+++ b/src/Pixel.Identity.Provider/Views/Shared/_Layout.cshtml
@@ -25,7 +25,7 @@
     </div>      
     <script src="~/lib/jquery/jquery.min.js"></script>
     <script src="~/lib/twitter-bootstrap/js/bootstrap.bundle.min.js"></script>   
-    <script src="_framework/blazor.server.js"></script>
+    <script src="_framework/blazor.web.js"></script>
     <script src="_content/MudBlazor/MudBlazor.min.js"></script>
     @await RenderSectionAsync("Scripts", required:false)
 </body>
diff --git a/src/Pixel.Identity.Provider/_Imports.razor b/src/Pixel.Identity.Provider/_Imports.razor
index 65c17d3..74e4781 100644
--- a/src/Pixel.Identity.Provider/_Imports.razor
+++ b/src/Pixel.Identity.Provider/_Imports.razor
@@ -7,3 +7,4 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
 @using MudBlazor;
+@using Pixel.Identity.Provider.Components;
