From 0a86aa8aa4f36246a8eeb53dd9b589d46e616422 Mon Sep 17 00:00:00 2001
From: Marcel Baumgartner <marcel.kbkm@gmail.com>
Date: Mon, 17 Jul 2023 00:48:27 +0200
Subject: [PATCH] Implemented new permission and identity system

---
 .../Api/Moonlight/BillingController.cs        |   4 +-
 .../Notifications/RegisterController.cs       |   2 +-
 .../Api/Moonlight/OAuth2Controller.cs         |   2 +-
 Moonlight/App/Perms/Permissions.cs            | 401 +++++++++++++---
 Moonlight/App/Services/RatingService.cs       |   4 +-
 .../App/Services/Sessions/IdentityService.cs  | 100 ++--
 .../App/Services/Sessions/IpBanService.cs     |   2 +-
 .../App/Services/Sessions/IpLocateService.cs  |   2 +-
 .../Services/Sessions/SessionClientService.cs |   6 +-
 .../SupportChat/SupportChatAdminService.cs    |   2 +-
 .../SupportChat/SupportChatClientService.cs   |   2 +-
 Moonlight/App/Services/TotpService.cs         |  26 +-
 Moonlight/App/Services/UserService.cs         |  16 +-
 Moonlight/Moonlight.csproj                    |   2 +
 .../Components/Auth/PasswordChangeView.razor  |   5 +-
 .../Components/Auth/UserDataSetView.razor     |   5 +-
 .../ErrorBoundaries/PageErrorBoundary.razor   |   2 +-
 .../Navigations/ProfileNavigation.razor       |  14 +-
 .../Shared/Components/Partials/Navbar.razor   |   2 +-
 .../Partials/RenderPermissionChecker.razor    |   2 +-
 .../Shared/Components/Partials/Sidebar.razor  |   2 +-
 .../Components/Partials/SidebarMenu.razor     |   2 +-
 .../Components/StateLogic/OnlyAdmin.razor     |  28 --
 Moonlight/Shared/Layouts/MainLayout.razor     | 170 +++----
 Moonlight/Shared/Layouts/NotFoundLayout.razor |   4 +-
 .../Shared/Views/Admin/Databases/Index.razor  |   5 -
 .../Shared/Views/Admin/Domains/Index.razor    |  98 ++--
 .../Shared/Views/Admin/Domains/New.razor      |   6 +-
 .../Views/Admin/Domains/Shared/Index.razor    |  66 +--
 .../Views/Admin/Domains/Shared/New.razor      |   2 +
 Moonlight/Shared/Views/Admin/Index.razor      |   1 -
 Moonlight/Shared/Views/Admin/Nodes/Ddos.razor | 104 ++---
 Moonlight/Shared/Views/Admin/Nodes/Edit.razor |   6 +-
 .../Shared/Views/Admin/Nodes/Index.razor      | 158 +++----
 Moonlight/Shared/Views/Admin/Nodes/New.razor  |   6 +-
 .../Shared/Views/Admin/Nodes/Setup.razor      |   6 +-
 Moonlight/Shared/Views/Admin/Nodes/View.razor |   4 +-
 .../Views/Admin/Notifications/Debugging.razor |   7 +-
 .../Shared/Views/Admin/Servers/Cleanup.razor  |   6 +-
 .../Shared/Views/Admin/Servers/Edit.razor     | 312 ++++++-------
 .../Shared/Views/Admin/Servers/Index.razor    |   2 +-
 .../Shared/Views/Admin/Servers/Manager.razor  | 154 +++----
 .../Shared/Views/Admin/Servers/New.razor      | 308 ++++++-------
 Moonlight/Shared/Views/Admin/Statistics.razor | 124 ++---
 .../Views/Admin/Subscriptions/Edit.razor      | 278 +++++------
 .../Views/Admin/Subscriptions/Index.razor     |  88 ++--
 .../Views/Admin/Subscriptions/New.razor       | 264 +++++------
 .../Shared/Views/Admin/Support/Index.razor    |   6 +-
 .../Shared/Views/Admin/Support/View.razor     | 382 ++++++++--------
 .../Views/Admin/Sys/Configuration.razor       |   2 +-
 .../Shared/Views/Admin/Sys/DiscordBot.razor   |   2 +-
 Moonlight/Shared/Views/Admin/Sys/Index.razor  |   2 +-
 Moonlight/Shared/Views/Admin/Sys/Mail.razor   |  10 +-
 .../Shared/Views/Admin/Sys/Malware.razor      |   2 +-
 .../Shared/Views/Admin/Sys/News/Edit.razor    |   2 +-
 .../Shared/Views/Admin/Sys/News/Index.razor   |   2 +-
 .../Shared/Views/Admin/Sys/News/New.razor     |   2 +-
 .../Shared/Views/Admin/Sys/Resources.razor    |   2 +-
 .../Shared/Views/Admin/Sys/Security.razor     |   2 +-
 Moonlight/Shared/Views/Admin/Sys/Sentry.razor |   2 +-
 Moonlight/Shared/Views/Admin/Users/Edit.razor |   6 +-
 .../Shared/Views/Admin/Users/Index.razor      |  82 ++--
 Moonlight/Shared/Views/Admin/Users/New.razor  |  80 ++--
 .../Shared/Views/Admin/Users/Sessions.razor   | 166 +++----
 Moonlight/Shared/Views/Admin/Users/View.razor | 432 +++++++++---------
 .../Shared/Views/Admin/Webspaces/Index.razor  | 106 ++---
 .../Shared/Views/Admin/Webspaces/New.razor    |  60 +--
 .../Views/Admin/Webspaces/Servers/Edit.razor  |   6 +-
 .../Views/Admin/Webspaces/Servers/Index.razor | 122 ++---
 .../Views/Admin/Webspaces/Servers/New.razor   |   6 +-
 Moonlight/Shared/Views/Domains/Create.razor   |  13 +-
 Moonlight/Shared/Views/Index.razor            |  11 +-
 Moonlight/Shared/Views/Profile/Discord.razor  |  11 +-
 Moonlight/Shared/Views/Profile/Index.razor    |  18 +-
 Moonlight/Shared/Views/Profile/Security.razor |  21 +-
 .../Views/Profile/Subscriptions/Index.razor   |  17 +-
 Moonlight/Shared/Views/Server/Index.razor     |   6 +-
 .../Shared/Views/Server/ServerFiles.razor     |   7 +-
 .../Views/Server/ServerNavigation.razor       |   9 +-
 Moonlight/Shared/Views/Servers/Create.razor   |  17 +-
 Moonlight/Shared/Views/Servers/Index.razor    |  17 +-
 Moonlight/Shared/Views/Support.razor          |   7 +-
 Moonlight/Shared/Views/Webspace/Index.razor   |   8 +-
 Moonlight/Shared/Views/Webspaces/Create.razor |  13 +-
 Moonlight/Shared/Views/Webspaces/Index.razor  |   7 +-
 Moonlight/_Imports.razor                      |   1 -
 86 files changed, 2372 insertions(+), 2107 deletions(-)
 delete mode 100644 Moonlight/Shared/Components/StateLogic/OnlyAdmin.razor
 delete mode 100644 Moonlight/Shared/Views/Admin/Databases/Index.razor

diff --git a/Moonlight/App/Http/Controllers/Api/Moonlight/BillingController.cs b/Moonlight/App/Http/Controllers/Api/Moonlight/BillingController.cs
index 9878b736..d31dd427 100644
--- a/Moonlight/App/Http/Controllers/Api/Moonlight/BillingController.cs
+++ b/Moonlight/App/Http/Controllers/Api/Moonlight/BillingController.cs
@@ -24,7 +24,7 @@ public class BillingController : Controller
     [HttpGet("cancel")]
     public async Task<ActionResult> Cancel()
     {
-        var user = await IdentityService.Get();
+        var user = IdentityService.User;
 
         if (user == null)
             return Redirect("/login");
@@ -35,7 +35,7 @@ public class BillingController : Controller
     [HttpGet("success")]
     public async Task<ActionResult> Success()
     {
-        var user = await IdentityService.Get();
+        var user = IdentityService.User;
 
         if (user == null)
             return Redirect("/login");
diff --git a/Moonlight/App/Http/Controllers/Api/Moonlight/Notifications/RegisterController.cs b/Moonlight/App/Http/Controllers/Api/Moonlight/Notifications/RegisterController.cs
index 9cbade42..8fc13ffb 100644
--- a/Moonlight/App/Http/Controllers/Api/Moonlight/Notifications/RegisterController.cs
+++ b/Moonlight/App/Http/Controllers/Api/Moonlight/Notifications/RegisterController.cs
@@ -25,7 +25,7 @@ public class RegisterController : Controller
     [HttpGet]
     public async Task<ActionResult<TokenRegister>> Register()
     {
-        var user = await IdentityService.Get();
+        var user = IdentityService.User;
 
         if (user == null)
             return NotFound();
diff --git a/Moonlight/App/Http/Controllers/Api/Moonlight/OAuth2Controller.cs b/Moonlight/App/Http/Controllers/Api/Moonlight/OAuth2Controller.cs
index bae68b49..a21b804f 100644
--- a/Moonlight/App/Http/Controllers/Api/Moonlight/OAuth2Controller.cs
+++ b/Moonlight/App/Http/Controllers/Api/Moonlight/OAuth2Controller.cs
@@ -54,7 +54,7 @@ public class OAuth2Controller : Controller
     {
         try
         {
-            var currentUser = await IdentityService.Get();
+            var currentUser = IdentityService.User;
 
             if (currentUser != null)
             {
diff --git a/Moonlight/App/Perms/Permissions.cs b/Moonlight/App/Perms/Permissions.cs
index 8e5cb011..1ffb9b45 100644
--- a/Moonlight/App/Perms/Permissions.cs
+++ b/Moonlight/App/Perms/Permissions.cs
@@ -5,106 +5,379 @@ public static class Permissions
     public static Permission AdminDashboard = new()
     {
         Index = 0,
-        Name = "Admin dashboard",
-        Description = "See basic information about growth and status of the moonlight instance"
+        Name = "Admin Dashboard",
+        Description = "Access the main admin dashboard page"
     };
-    
-    public static Permission SystemDashboard = new()
+
+    public static Permission AdminStatistics = new()
     {
         Index = 1,
-        Name = "System information",
-        Description = "See information about the moonlight instance like the uptime and memory usage"
+        Name = "Admin Statistics",
+        Description = "View statistical information about the moonlight instance"
     };
-    
-    public static Permission SystemSentry = new()
-    {
-        Index = 2,
-        Name = "Settings for Sentry",
-        Description = "See information about the sentry status"
-    };
-    
-    public static Permission SystemMalware = new()
-    {
-        Index = 3,
-        Name = "Server malware scanner",
-        Description = "Scan running servers for malware"
-    };
-    
-    public static Permission SystemSecurity = new()
+
+    public static Permission AdminDomains = new()
     {
         Index = 4,
-        Name = "System security settings",
-        Description = "Ban ip addresses and view the security logs"
+        Name = "Admin Domains",
+        Description = "Manage domains in the admin area"
     };
-    
-    public static Permission SystemResources = new()
+
+    public static Permission AdminNewDomain = new()
     {
         Index = 5,
-        Name = "Resources",
-        Description = "Read and write moonlight resources like configuration files"
+        Name = "Admin New Domain",
+        Description = "Create a new domain in the admin area"
     };
-    
-    public static Permission DiscordBot = new()
+
+    public static Permission AdminSharedDomains = new()
     {
         Index = 6,
-        Name = "Discord bot actions",
-        Description = "Setup and remote control the discord bot if enabled"
+        Name = "Admin Shared Domains",
+        Description = "Manage shared domains in the admin area"
     };
-    
-    public static Permission NewsMessages = new()
+
+    public static Permission AdminNewSharedDomain = new()
     {
         Index = 7,
-        Name = "News messages",
-        Description = "Edit, view and delete messages for the user dashboard"
+        Name = "Admin New Shared Domain",
+        Description = "Create a new shared domain in the admin area"
     };
-    
-    public static Permission SystemConfiguration = new()
+
+    public static Permission AdminNodeDdos = new()
     {
         Index = 8,
-        Name = "System configuration",
-        Description = "Modify the moonlight configuration though the visual editor"
+        Name = "Admin Node DDoS",
+        Description = "Manage DDoS protection for nodes in the admin area"
     };
-    
-    public static Permission SystemMail = new()
+
+    public static Permission AdminNodeEdit = new()
     {
         Index = 9,
-        Name = "System mail settings",
-        Description = "Modify the mail templates and send test mails"
+        Name = "Admin Node Edit",
+        Description = "Edit node settings in the admin area"
     };
-    
-    public static Permission ServersOverview = new()
+
+    public static Permission AdminNodes = new()
     {
         Index = 10,
-        Name = "Servers overview",
-        Description = "View all servers and their owners"
+        Name = "Admin Node",
+        Description = "Access the node management page in the admin area"
     };
-    
-    public static Permission ServerAdminEdit = new()
+
+    public static Permission AdminNewNode = new()
     {
         Index = 11,
-        Name = "Edit servers",
-        Description = "View all servers and their owners"
+        Name = "Admin New Node",
+        Description = "Create a new node in the admin area"
     };
-    
-    public static Permission ServerManager = new()
+
+    public static Permission AdminNodeSetup = new()
     {
         Index = 12,
-        Name = "Server manager",
-        Description = "View all servers are currently running and stop/kill all running servers"
+        Name = "Admin Node Setup",
+        Description = "Set up a node in the admin area"
     };
-    
-    public static Permission ServerCleanup = new()
+
+    public static Permission AdminNodeView = new()
     {
         Index = 13,
-        Name = "Server cleanup",
-        Description = "View the stats about the cleanup system"
+        Name = "Admin Node View",
+        Description = "View node details in the admin area"
     };
-    
-    public static Permission Nodes = new()
+
+    public static Permission AdminNotificationDebugging = new()
     {
         Index = 14,
-        Name = "Nodes",
-        Description = "View stats about the nodes"
+        Name = "Admin Notification Debugging",
+        Description = "Manage debugging notifications in the admin area"
+    };
+
+    public static Permission AdminServerCleanup = new()
+    {
+        Index = 15,
+        Name = "Admin Server Cleanup",
+        Description = "Perform server cleanup tasks in the admin area"
+    };
+
+    public static Permission AdminServerEdit = new()
+    {
+        Index = 16,
+        Name = "Admin Server Edit",
+        Description = "Edit server settings in the admin area"
+    };
+
+    public static Permission AdminServers = new()
+    {
+        Index = 17,
+        Name = "Admin Server",
+        Description = "Access the server management page in the admin area"
+    };
+
+    public static Permission AdminServerManager = new()
+    {
+        Index = 18,
+        Name = "Admin Server Manager",
+        Description = "Manage servers in the admin area"
+    };
+
+    public static Permission AdminNewServer = new()
+    {
+        Index = 19,
+        Name = "Admin New Server",
+        Description = "Create a new server in the admin area"
+    };
+
+    public static Permission AdminServerImageEdit = new()
+    {
+        Index = 20,
+        Name = "Admin Server Image Edit",
+        Description = "Edit server image settings in the admin area"
+    };
+
+    public static Permission AdminServerImageIndex = new()
+    {
+        Index = 21,
+        Name = "Admin Server Image",
+        Description = "Access the server image management page in the admin area"
+    };
+
+    public static Permission AdminServerImageNew = new()
+    {
+        Index = 22,
+        Name = "Admin Server Image New",
+        Description = "Create a new server image in the admin area"
+    };
+
+    public static Permission AdminServerViewAllocations = new()
+    {
+        Index = 23,
+        Name = "Admin Server View Allocations",
+        Description = "View server allocations in the admin area"
+    };
+
+    public static Permission AdminServerViewArchive = new()
+    {
+        Index = 24,
+        Name = "Admin Server View Archive",
+        Description = "View server archive in the admin area"
+    };
+
+    public static Permission AdminServerViewDebug = new()
+    {
+        Index = 25,
+        Name = "Admin Server View Debug",
+        Description = "View server debugging information in the admin area"
+    };
+
+    public static Permission AdminServerViewImage = new()
+    {
+        Index = 26,
+        Name = "Admin Server View Image",
+        Description = "View server image details in the admin area"
+    };
+
+    public static Permission AdminServerViewIndex = new()
+    {
+        Index = 27,
+        Name = "Admin Server View",
+        Description = "Access the server view page in the admin area"
+    };
+
+    public static Permission AdminServerViewOverview = new()
+    {
+        Index = 28,
+        Name = "Admin Server View Overview",
+        Description = "View server overview in the admin area"
+    };
+
+    public static Permission AdminServerViewResources = new()
+    {
+        Index = 29,
+        Name = "Admin Server View Resources",
+        Description = "View server resources in the admin area"
+    };
+
+    public static Permission AdminSubscriptionEdit = new()
+    {
+        Index = 30,
+        Name = "Admin Subscription Edit",
+        Description = "Edit subscription settings in the admin area"
+    };
+
+    public static Permission AdminSubscriptions = new()
+    {
+        Index = 31,
+        Name = "Admin Subscriptions",
+        Description = "Access the subscription management page in the admin area"
+    };
+
+    public static Permission AdminNewSubscription = new()
+    {
+        Index = 32,
+        Name = "Admin New Subscription",
+        Description = "Create a new subscription in the admin area"
+    };
+
+    public static Permission AdminSupport = new()
+    {
+        Index = 33,
+        Name = "Admin Support",
+        Description = "Access the support page in the admin area"
+    };
+
+    public static Permission AdminSupportView = new()
+    {
+        Index = 34,
+        Name = "Admin Support View",
+        Description = "View support details in the admin area"
+    };
+
+    public static Permission AdminSysConfiguration = new()
+    {
+        Index = 35,
+        Name = "Admin system Configuration",
+        Description = "Access system configuration settings in the admin area"
+    };
+
+    public static Permission AdminSysDiscordBot = new()
+    {
+        Index = 36,
+        Name = "Admin system Discord Bot",
+        Description = "Manage Discord bot settings in the admin area"
+    };
+
+    public static Permission AdminSystem = new()
+    {
+        Index = 37,
+        Name = "Admin system",
+        Description = "Access the system management page in the admin area"
+    };
+
+    public static Permission AdminSysMail = new()
+    {
+        Index = 38,
+        Name = "Admin system Mail",
+        Description = "Manage mail settings in the admin area"
+    };
+
+    public static Permission AdminSysMalware = new()
+    {
+        Index = 39,
+        Name = "Admin system Malware",
+        Description = "Manage malware settings in the admin area"
+    };
+
+    public static Permission AdminSysResources = new()
+    {
+        Index = 40,
+        Name = "Admin system Resources",
+        Description = "View system resources in the admin area"
+    };
+
+    public static Permission AdminSysSecurity = new()
+    {
+        Index = 41,
+        Name = "Admin system Security",
+        Description = "Manage security settings in the admin area"
+    };
+
+    public static Permission AdminSysSentry = new()
+    {
+        Index = 42,
+        Name = "Admin system Sentry",
+        Description = "Manage Sentry settings in the admin area"
+    };
+
+    public static Permission AdminSysNewsEdit = new()
+    {
+        Index = 43,
+        Name = "Admin system News Edit",
+        Description = "Edit system news in the admin area"
+    };
+
+    public static Permission AdminSysNews = new()
+    {
+        Index = 44,
+        Name = "Admin system News",
+        Description = "Access the system news management page in the admin area"
+    };
+
+    public static Permission AdminSysNewsNew = new()
+    {
+        Index = 45,
+        Name = "Admin system News New",
+        Description = "Create new system news in the admin area"
+    };
+
+    public static Permission AdminUserEdit = new()
+    {
+        Index = 46,
+        Name = "Admin User Edit",
+        Description = "Edit user settings in the admin area"
+    };
+
+    public static Permission AdminUsers = new()
+    {
+        Index = 47,
+        Name = "Admin Users",
+        Description = "Access the user management page in the admin area"
+    };
+
+    public static Permission AdminNewUser = new()
+    {
+        Index = 48,
+        Name = "Admin New User",
+        Description = "Create a new user in the admin area"
+    };
+
+    public static Permission AdminUserSessions = new()
+    {
+        Index = 49,
+        Name = "Admin User Sessions",
+        Description = "View user sessions in the admin area"
+    };
+
+    public static Permission AdminUserView = new()
+    {
+        Index = 50,
+        Name = "Admin User View",
+        Description = "View user details in the admin area"
+    };
+
+    public static Permission AdminWebspaces = new()
+    {
+        Index = 51,
+        Name = "Admin Webspaces",
+        Description = "Access the webspaces management page in the admin area"
+    };
+
+    public static Permission AdminNewWebspace = new()
+    {
+        Index = 52,
+        Name = "Admin New Webspace",
+        Description = "Create a new webspace in the admin area"
+    };
+
+    public static Permission AdminWebspacesServerEdit = new()
+    {
+        Index = 53,
+        Name = "Admin Webspaces Server Edit",
+        Description = "Edit webspace server settings in the admin area"
+    };
+
+    public static Permission AdminWebspacesServers = new()
+    {
+        Index = 54,
+        Name = "Admin Webspaces Servers",
+        Description = "Access the webspace server management page in the admin area"
+    };
+
+    public static Permission AdminWebspacesServerNew = new()
+    {
+        Index = 55,
+        Name = "Admin Webspaces Server New",
+        Description = "Create a new webspace server in the admin area"
     };
 
     public static Permission? FromString(string name)
diff --git a/Moonlight/App/Services/RatingService.cs b/Moonlight/App/Services/RatingService.cs
index e0e6bef7..083ed4cc 100644
--- a/Moonlight/App/Services/RatingService.cs
+++ b/Moonlight/App/Services/RatingService.cs
@@ -39,7 +39,7 @@ public class RatingService
         if (!Enabled)
             return false;
 
-        var user = await IdentityService.Get();
+        var user = IdentityService.User;
 
         if (user == null)
             return false;
@@ -62,7 +62,7 @@ public class RatingService
 
     public async Task<bool> Rate(int rate)
     {
-        var user = await IdentityService.Get();
+        var user = IdentityService.User;
         
         // Double check states:
         
diff --git a/Moonlight/App/Services/Sessions/IdentityService.cs b/Moonlight/App/Services/Sessions/IdentityService.cs
index f70c5299..8f615b35 100644
--- a/Moonlight/App/Services/Sessions/IdentityService.cs
+++ b/Moonlight/App/Services/Sessions/IdentityService.cs
@@ -5,7 +5,6 @@ using JWT.Exceptions;
 using Microsoft.EntityFrameworkCore;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Helpers;
-using Moonlight.App.Models.Misc;
 using Moonlight.App.Perms;
 using Moonlight.App.Repositories;
 using UAParser;
@@ -19,8 +18,9 @@ public class IdentityService
     private readonly IHttpContextAccessor HttpContextAccessor;
     private readonly string Secret;
 
-    private User? UserCache;
-
+    public User User { get; private set; }
+    public string Ip { get; private set; } = "N/A";
+    public string Device { get; private set; } = "N/A";
     public PermissionStorage Permissions { get; private set; }
     public PermissionStorage UserPermissions { get; private set; }
     public PermissionStorage GroupPermissions { get; private set; }
@@ -40,15 +40,17 @@ public class IdentityService
             .Moonlight.Security.Token;
     }
 
-    public async Task<User?> Get()
+    public async Task Load()
+    {
+        await LoadIp();
+        await LoadDevice();
+        await LoadUser();
+    }
+
+    private async Task LoadUser()
     {
         try
         {
-            if (UserCache != null)
-                return UserCache;
-
-            ConstructPermissions();
-
             var token = "none";
 
             // Load token via http context if available
@@ -68,13 +70,13 @@ public class IdentityService
 
             if (token == "none")
             {
-                return null;
+                return;
             }
 
             if (string.IsNullOrEmpty(token))
-                return null;
+                return;
 
-            var json = "";
+            string json;
 
             try
             {
@@ -85,18 +87,18 @@ public class IdentityService
             }
             catch (TokenExpiredException)
             {
-                return null;
+                return;
             }
             catch (SignatureVerificationException)
             {
                 Logger.Warn($"Detected a manipulated JWT: {token}", "security");
-                return null;
+                return;
             }
             catch (Exception e)
             {
                 Logger.Error("Error reading jwt");
                 Logger.Error(e);
-                return null;
+                return;
             }
 
             // To make it easier to use the json data
@@ -111,7 +113,7 @@ public class IdentityService
             {
                 Logger.Warn(
                     $"Cannot find user with the id '{userid}' in the database. Maybe the user has been deleted or a token has been successfully faked by a hacker");
-                return null;
+                return;
             }
 
             var iat = data.GetValue<long>("iat", -1);
@@ -119,48 +121,54 @@ public class IdentityService
             if (iat == -1)
             {
                 Logger.Debug("Legacy token found (without the time the token has been issued at)");
-                return null;
+                return;
             }
 
             var iatD = DateTimeOffset.FromUnixTimeSeconds(iat).ToUniversalTime().DateTime;
 
             if (iatD < user.TokenValidTime)
-                return null;
+                return;
 
-            UserCache = user;
+            User = user;
 
             ConstructPermissions();
 
-            user.LastIp = GetIp();
-            UserRepository.Update(user);
-
-            return UserCache;
+            User.LastIp = Ip;
+            UserRepository.Update(User);
         }
         catch (Exception e)
         {
             Logger.Error("Unexpected error while processing token");
             Logger.Error(e);
-            return null;
+            return;
         }
     }
 
-    public string GetIp()
+    private Task LoadIp()
     {
         if (HttpContextAccessor.HttpContext == null)
-            return "N/A";
+        {
+            Ip = "N/A";
+            return Task.CompletedTask;
+        }
 
         if (HttpContextAccessor.HttpContext.Request.Headers.ContainsKey("X-Real-IP"))
         {
-            return HttpContextAccessor.HttpContext.Request.Headers["X-Real-IP"]!;
+            Ip = HttpContextAccessor.HttpContext.Request.Headers["X-Real-IP"]!;
+            return Task.CompletedTask;
         }
 
-        return HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString();
+        Ip = HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString();
+        return Task.CompletedTask;
     }
 
-    public string GetDevice()
+    private Task LoadDevice()
     {
         if (HttpContextAccessor.HttpContext == null)
-            return "N/A";
+        {
+            Device = "N/A";
+            return Task.CompletedTask;
+        }
 
         try
         {
@@ -170,26 +178,29 @@ public class IdentityService
             {
                 var version = userAgent.Remove(0, "Moonlight.App/".Length).Split(' ').FirstOrDefault();
 
-                return "Moonlight App " + version;
+                Device = "Moonlight App " + version;
+                return Task.CompletedTask;
             }
 
             var uaParser = Parser.GetDefault();
             var info = uaParser.Parse(userAgent);
 
-            return $"{info.OS} - {info.Device}";
+            Device = $"{info.OS} - {info.Device}";
+            return Task.CompletedTask;
         }
         catch (Exception e)
         {
-            return "UserAgent not present";
+            Device = "UserAgent not present";
+            return Task.CompletedTask;
         }
     }
 
     public Task SavePermissions()
     {
-        if (UserCache != null)
+        if (User != null)
         {
-            UserCache.Permissions = UserPermissions.Data;
-            UserRepository.Update(UserCache);
+            User.Permissions = UserPermissions.Data;
+            UserRepository.Update(User);
             ConstructPermissions();
         }
 
@@ -198,7 +209,7 @@ public class IdentityService
 
     private void ConstructPermissions()
     {
-        if (UserCache == null)
+        if (User == null)
         {
             UserPermissions = new(Array.Empty<byte>());
             GroupPermissions = new(Array.Empty<byte>(), true);
@@ -210,7 +221,7 @@ public class IdentityService
         var user = UserRepository
             .Get()
             .Include(x => x.PermissionGroup)
-            .First(x => x.Id == UserCache.Id);
+            .First(x => x.Id == User.Id);
 
         UserPermissions = new PermissionStorage(user.Permissions);
 
@@ -219,7 +230,18 @@ public class IdentityService
         else
             GroupPermissions = new PermissionStorage(user.PermissionGroup.Permissions, true);
 
-        Logger.Debug($"{UserPermissions[Perms.Permissions.AdminDashboard]} {GroupPermissions[Perms.Permissions.AdminDashboard]}");
+        if (user.Admin)
+        {
+            Permissions = new PermissionStorage(Array.Empty<byte>());
+
+            foreach (var permission in Perms.Permissions.GetAllPermissions())
+            {
+                Permissions[permission] = true;
+            }
+
+            Permissions.IsReadyOnly = true;
+            return;
+        }
         
         Permissions = new PermissionStorage(BitHelper.OverwriteByteArrays(
             UserPermissions.Data,
diff --git a/Moonlight/App/Services/Sessions/IpBanService.cs b/Moonlight/App/Services/Sessions/IpBanService.cs
index 6fd6af15..1159b45a 100644
--- a/Moonlight/App/Services/Sessions/IpBanService.cs
+++ b/Moonlight/App/Services/Sessions/IpBanService.cs
@@ -19,7 +19,7 @@ public class IpBanService
 
     public Task<bool> IsBanned()
     {
-        var ip = IdentityService.GetIp();
+        var ip = IdentityService.Ip;
 
         return Task.FromResult(
             IpBanRepository
diff --git a/Moonlight/App/Services/Sessions/IpLocateService.cs b/Moonlight/App/Services/Sessions/IpLocateService.cs
index 95d59a8c..4ce5a6bf 100644
--- a/Moonlight/App/Services/Sessions/IpLocateService.cs
+++ b/Moonlight/App/Services/Sessions/IpLocateService.cs
@@ -15,7 +15,7 @@ public class IpLocateService
 
     public async Task<string> GetLocation()
     {
-        var ip = IdentityService.GetIp();
+        var ip = IdentityService.Ip;
         var location = "N/A";
 
         if (ip != "N/A")
diff --git a/Moonlight/App/Services/Sessions/SessionClientService.cs b/Moonlight/App/Services/Sessions/SessionClientService.cs
index e7040ba4..8ff084f6 100644
--- a/Moonlight/App/Services/Sessions/SessionClientService.cs
+++ b/Moonlight/App/Services/Sessions/SessionClientService.cs
@@ -40,9 +40,9 @@ public class SessionClientService
 
     public async Task Start()
     {
-        User = await IdentityService.Get();
-        Ip = IdentityService.GetIp();
-        Device = IdentityService.GetDevice();
+        User = IdentityService.User;
+        Ip = IdentityService.Ip;
+        Device = IdentityService.Device;
 
         if (User != null) // Track users last visit
         {
diff --git a/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs b/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs
index d9acc9ef..20c67290 100644
--- a/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs
+++ b/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs
@@ -34,7 +34,7 @@ public class SupportChatAdminService : IDisposable
 
     public async Task Start(User recipient)
     {
-        User = await IdentityService.Get();
+        User = IdentityService.User;
         Recipient = recipient;
 
         if (User != null)
diff --git a/Moonlight/App/Services/SupportChat/SupportChatClientService.cs b/Moonlight/App/Services/SupportChat/SupportChatClientService.cs
index 8c079cfc..c4f695ce 100644
--- a/Moonlight/App/Services/SupportChat/SupportChatClientService.cs
+++ b/Moonlight/App/Services/SupportChat/SupportChatClientService.cs
@@ -33,7 +33,7 @@ public class SupportChatClientService : IDisposable
 
     public async Task Start()
     {
-        User = await IdentityService.Get();
+        User = IdentityService.User;
 
         if (User != null)
         {
diff --git a/Moonlight/App/Services/TotpService.cs b/Moonlight/App/Services/TotpService.cs
index ef46b9f0..2d624d92 100644
--- a/Moonlight/App/Services/TotpService.cs
+++ b/Moonlight/App/Services/TotpService.cs
@@ -25,32 +25,30 @@ public class TotpService
         return Task.FromResult(codeserver == code);
     }
 
-    public async Task<bool> GetEnabled()
+    public Task<bool> GetEnabled()
     {
-        var user = await IdentityService.Get();
-
-        return user!.TotpEnabled;
+        return Task.FromResult(IdentityService.User.TotpEnabled);
     }
 
-    public async Task<string> GetSecret()
+    public Task<string> GetSecret()
     {
-        var user = await IdentityService.Get();
-        
-        return user!.TotpSecret;
+        return Task.FromResult(IdentityService.User.TotpSecret);
     }
 
-    public async Task GenerateSecret()
+    public Task GenerateSecret()
     {
-        var user = (await IdentityService.Get())!;
+        var user = IdentityService.User;
         
         user.TotpSecret = Base32Encoding.ToString(KeyGeneration.GenerateRandomKey(20));;
         
         UserRepository.Update(user);
+        
+        return Task.CompletedTask;
     }
 
     public async Task Enable(string code)
     {
-        var user = (await IdentityService.Get())!;
+        var user = IdentityService.User;
 
         if (!await Verify(user.TotpSecret, code))
         {
@@ -61,9 +59,9 @@ public class TotpService
         UserRepository.Update(user);
     }
 
-    public async Task Disable()
+    public Task Disable()
     {
-        var user = (await IdentityService.Get())!;
+        var user = IdentityService.User;
 
         user.TotpEnabled = false;
         user.TotpSecret = "";
@@ -71,5 +69,7 @@ public class TotpService
         UserRepository.Update(user);
         
         //TODO: AuditLog
+        
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/Moonlight/App/Services/UserService.cs b/Moonlight/App/Services/UserService.cs
index cab1b644..77c26316 100644
--- a/Moonlight/App/Services/UserService.cs
+++ b/Moonlight/App/Services/UserService.cs
@@ -85,8 +85,8 @@ public class UserService
             TotpSecret = "",
             UpdatedAt = DateTimeService.GetCurrent(),
             TokenValidTime = DateTimeService.GetCurrent().AddDays(-5),
-            LastIp = IdentityService.GetIp(),
-            RegisterIp = IdentityService.GetIp()
+            LastIp = IdentityService.Ip,
+            RegisterIp = IdentityService.Ip
         });
 
         await MailService.SendMail(user!, "register", values => {});
@@ -174,8 +174,8 @@ public class UserService
             
             await MailService.SendMail(user!, "passwordChange", values =>
             {
-                values.Add("Ip", IdentityService.GetIp());
-                values.Add("Device", IdentityService.GetDevice());
+                values.Add("Ip", IdentityService.Ip);
+                values.Add("Device", IdentityService.Device);
                 values.Add("Location", location);
             });
 
@@ -212,8 +212,8 @@ public class UserService
         {
             await MailService.SendMail(user!, "login", values =>
             {
-                values.Add("Ip", IdentityService.GetIp());
-                values.Add("Device", IdentityService.GetDevice());
+                values.Add("Ip", IdentityService.Ip);
+                values.Add("Device", IdentityService.Device);
                 values.Add("Location", location);
             });
         }
@@ -249,8 +249,8 @@ public class UserService
 
         await MailService.SendMail(user, "passwordReset", values =>
         {
-            values.Add("Ip", IdentityService.GetIp());
-            values.Add("Device", IdentityService.GetDevice());
+            values.Add("Ip", IdentityService.Ip);
+            values.Add("Device", IdentityService.Device);
             values.Add("Location", location);
             values.Add("Password", newPassword);
         });
diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj
index 02cac376..078f2ddc 100644
--- a/Moonlight/Moonlight.csproj
+++ b/Moonlight/Moonlight.csproj
@@ -78,6 +78,8 @@
     <_ContentIncludedByDefault Remove="Shared\Components\News\NewsEditor.razor" />
     <_ContentIncludedByDefault Remove="Shared\News\Edit.razor" />
     <_ContentIncludedByDefault Remove="Shared\Views\Admin\AaPanels\Index.razor" />
+    <_ContentIncludedByDefault Remove="Shared\Views\Admin\Databases\Index.razor" />
+    <_ContentIncludedByDefault Remove="Shared\Components\StateLogic\OnlyAdmin.razor" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Moonlight/Shared/Components/Auth/PasswordChangeView.razor b/Moonlight/Shared/Components/Auth/PasswordChangeView.razor
index f57d1aa7..38e0e866 100644
--- a/Moonlight/Shared/Components/Auth/PasswordChangeView.razor
+++ b/Moonlight/Shared/Components/Auth/PasswordChangeView.razor
@@ -49,9 +49,10 @@
     private PasswordModel Password = new();
     private User User;
 
-    private async Task Load(LazyLoader loader)
+    private Task Load(LazyLoader loader)
     {
-        User = await IdentityService.Get();
+        User = IdentityService.User;
+        return Task.CompletedTask;
     }
 
     private async Task DoChange()
diff --git a/Moonlight/Shared/Components/Auth/UserDataSetView.razor b/Moonlight/Shared/Components/Auth/UserDataSetView.razor
index d1191ec1..f8c64e8a 100644
--- a/Moonlight/Shared/Components/Auth/UserDataSetView.razor
+++ b/Moonlight/Shared/Components/Auth/UserDataSetView.razor
@@ -50,9 +50,10 @@
     private User User;
     private NameModel Name = new ();
     
-    private async Task Load(LazyLoader loader)
+    private Task Load(LazyLoader loader)
     {
-        User = await IdentityService.Get();
+        User = IdentityService.User;
+        return Task.CompletedTask;
     }
 
     private async Task SetName()
diff --git a/Moonlight/Shared/Components/ErrorBoundaries/PageErrorBoundary.razor b/Moonlight/Shared/Components/ErrorBoundaries/PageErrorBoundary.razor
index 4cc364fa..587e43f1 100644
--- a/Moonlight/Shared/Components/ErrorBoundaries/PageErrorBoundary.razor
+++ b/Moonlight/Shared/Components/ErrorBoundaries/PageErrorBoundary.razor
@@ -57,7 +57,7 @@ else
     {
         receivedExceptions.Add(exception);
 
-        var user = await IdentityService.Get();
+        var user = IdentityService.User;
         var id = user == null ? -1 : user.Id;
 
         Logger.Error($"[{id}] An unhanded exception occured:");
diff --git a/Moonlight/Shared/Components/Navigations/ProfileNavigation.razor b/Moonlight/Shared/Components/Navigations/ProfileNavigation.razor
index 76caf128..e7db20a1 100644
--- a/Moonlight/Shared/Components/Navigations/ProfileNavigation.razor
+++ b/Moonlight/Shared/Components/Navigations/ProfileNavigation.razor
@@ -1,5 +1,8 @@
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Models.Misc
+@using Moonlight.App.Services.Sessions
+
+@inject IdentityService IdentityService
 
 <div class="card mb-5 mb-xl-10">
     <div class="card-body pt-9 pb-0">
@@ -8,16 +11,16 @@
                 <div class="d-flex justify-content-between align-items-start flex-wrap mb-2">
                     <div class="d-flex flex-column">
                         <div class="d-flex align-items-center mb-2">
-                            <a class="text-gray-900 fs-2 fw-bold me-1 @(User.StreamerMode ? "blur" : "")">@(User.FirstName) @(User.LastName)</a>
+                            <a class="text-gray-900 fs-2 fw-bold me-1 @(IdentityService.User.StreamerMode ? "blur" : "")">@(IdentityService.User.FirstName) @(IdentityService.User.LastName)</a>
 
-                            @if (User.Status == UserStatus.Verified)
+                            @if (IdentityService.User.Status == UserStatus.Verified)
                             {
                                 <i class="text-success bx bx-md bxs-badge-check"></i>
                             }
                         </div>
                         <div class="d-flex flex-wrap fw-semibold fs-6 mb-4 pe-2">
-                            <span class="d-flex align-items-center text-gray-400 mb-2 @(User.StreamerMode ? "blur" : "")">
-                                @(User.Email)
+                            <span class="d-flex align-items-center text-gray-400 mb-2 @(IdentityService.User.StreamerMode ? "blur" : "")">
+                                @(IdentityService.User.Email)
                             </span>
                         </div>
                     </div>
@@ -51,9 +54,6 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
-
     [Parameter]
     public int Index { get; set; } = 0;
 }
\ No newline at end of file
diff --git a/Moonlight/Shared/Components/Partials/Navbar.razor b/Moonlight/Shared/Components/Partials/Navbar.razor
index 58e0376a..00b57ae6 100644
--- a/Moonlight/Shared/Components/Partials/Navbar.razor
+++ b/Moonlight/Shared/Components/Partials/Navbar.razor
@@ -106,7 +106,7 @@
     {
         if (firstRender)
         {
-            User = await IdentityService.Get();
+            User = IdentityService.User;
 
             await InvokeAsync(StateHasChanged);
         }
diff --git a/Moonlight/Shared/Components/Partials/RenderPermissionChecker.razor b/Moonlight/Shared/Components/Partials/RenderPermissionChecker.razor
index 319ac452..6ccf7137 100644
--- a/Moonlight/Shared/Components/Partials/RenderPermissionChecker.razor
+++ b/Moonlight/Shared/Components/Partials/RenderPermissionChecker.razor
@@ -54,7 +54,7 @@ else
 
         if (!Allowed)
         {
-            Logger.Warn($"{IdentityService.GetIp()} has tried to access {NavigationManager.Uri} without permission", "security");
+            Logger.Warn($"{IdentityService.Ip} has tried to access {NavigationManager.Uri} without permission", "security");
         }
         
         return Task.CompletedTask;
diff --git a/Moonlight/Shared/Components/Partials/Sidebar.razor b/Moonlight/Shared/Components/Partials/Sidebar.razor
index 41b19160..325b7857 100644
--- a/Moonlight/Shared/Components/Partials/Sidebar.razor
+++ b/Moonlight/Shared/Components/Partials/Sidebar.razor
@@ -49,7 +49,7 @@
     {
         if (firstRender)
         {
-            User = await IdentityService.Get();
+            User = IdentityService.User;
             sidebar = await JsRuntime.InvokeAsync<string>("document.body.getAttribute", "data-kt-app-layout");
             StateHasChanged();
         }
diff --git a/Moonlight/Shared/Components/Partials/SidebarMenu.razor b/Moonlight/Shared/Components/Partials/SidebarMenu.razor
index 9926d16e..e4e7090d 100644
--- a/Moonlight/Shared/Components/Partials/SidebarMenu.razor
+++ b/Moonlight/Shared/Components/Partials/SidebarMenu.razor
@@ -228,7 +228,7 @@ else
     {
         if (firstRender)
         {
-            User = await IdentityService.Get();
+            User = IdentityService.User;
 
             await InvokeAsync(StateHasChanged);
         }
diff --git a/Moonlight/Shared/Components/StateLogic/OnlyAdmin.razor b/Moonlight/Shared/Components/StateLogic/OnlyAdmin.razor
deleted file mode 100644
index 194c646b..00000000
--- a/Moonlight/Shared/Components/StateLogic/OnlyAdmin.razor
+++ /dev/null
@@ -1,28 +0,0 @@
-@using Moonlight.App.Services.Sessions
-@using Moonlight.App.Database.Entities
-
-@if (User != null)
-{
-    if (User.Admin)
-    {
-        @ChildContent
-    }
-    else if(!Silent)
-    {
-        <div class="alert alert-danger">
-            <TL>Missing admin permissions. This attempt has been logged ;)</TL>
-        </div>
-    }
-}
-
-@code
-{
-    [Parameter]
-    public RenderFragment ChildContent { get; set; }
-
-    [CascadingParameter]
-    public User? User { get; set; }
-
-    [Parameter]
-    public bool Silent { get; set; } = false;
-}
diff --git a/Moonlight/Shared/Layouts/MainLayout.razor b/Moonlight/Shared/Layouts/MainLayout.razor
index 28f4e29c..6ea2985b 100644
--- a/Moonlight/Shared/Layouts/MainLayout.razor
+++ b/Moonlight/Shared/Layouts/MainLayout.razor
@@ -42,94 +42,79 @@
 }
 
 <GlobalErrorBoundary>
-    <CascadingValue Value="User">
-        <PageTitle>@(string.IsNullOrEmpty(title) ? "Dashboard - " : title)Moonlight</PageTitle>
+    <PageTitle>@(string.IsNullOrEmpty(title) ? "Dashboard - " : title)Moonlight</PageTitle>
 
-        <div class="d-flex flex-column flex-root app-root" id="kt_app_root">
-            <div class="app-page flex-column flex-column-fluid" id="kt_app_page">
-                <canvas id="snow" class="snow-canvas"></canvas>
+    <div class="d-flex flex-column flex-root app-root" id="kt_app_root">
+        <div class="app-page flex-column flex-column-fluid" id="kt_app_page">
+            <canvas id="snow" class="snow-canvas"></canvas>
 
-                @{
-                    //TODO: Add a way to disable the snow
-                }
+            @{
+                //TODO: Add a way to disable the snow
+            }
 
-                <PageHeader></PageHeader>
-                <div class="app-wrapper flex-column flex-row-fluid" id="kt_app_wrapper">
-                    <Sidebar></Sidebar>
-                    <div class="app-main flex-column flex-row-fluid" id="kt_app_main">
-                        <div class="d-flex flex-column flex-column-fluid">
-                            <div id="kt_app_content" class="app-content flex-column-fluid" style="background-position: center; background-size: cover; background-repeat: no-repeat; background-attachment: fixed; background-image: url('@(DynamicBackgroundService.BackgroundImageUrl)')">
-                                <div id="kt_app_content_container" class="app-container container-fluid">
-                                    <div class="mt-10">
-                                        <SoftErrorBoundary>
-                                            @if (!IsIpBanned)
+            <PageHeader></PageHeader>
+            <div class="app-wrapper flex-column flex-row-fluid" id="kt_app_wrapper">
+                <Sidebar></Sidebar>
+                <div class="app-main flex-column flex-row-fluid" id="kt_app_main">
+                    <div class="d-flex flex-column flex-column-fluid">
+                        <div id="kt_app_content" class="app-content flex-column-fluid" style="background-position: center; background-size: cover; background-repeat: no-repeat; background-attachment: fixed; background-image: url('@(DynamicBackgroundService.BackgroundImageUrl)')">
+                            <div id="kt_app_content_container" class="app-container container-fluid">
+                                <div class="mt-10">
+                                    <SoftErrorBoundary>
+                                        @if (!IsIpBanned)
+                                        {
+                                            if (UserProcessed)
                                             {
-                                                if (UserProcessed)
+                                                if (uri.LocalPath != "/login" &&
+                                                    uri.LocalPath != "/passwordreset" &&
+                                                    uri.LocalPath != "/register")
                                                 {
-                                                    if (uri.LocalPath != "/login" &&
-                                                        uri.LocalPath != "/passwordreset" &&
-                                                        uri.LocalPath != "/register")
+                                                    if (IdentityService.User == null)
                                                     {
-                                                        if (User == null)
-                                                        {
-                                                            <Login></Login>
-                                                        }
-                                                        else
-                                                        {
-                                                            if (User.Status == UserStatus.Banned)
-                                                            {
-                                                                <BannedAlert></BannedAlert>
-                                                            }
-                                                            else if (User.Status == UserStatus.Disabled)
-                                                            {
-                                                                <DisabledAlert></DisabledAlert>
-                                                            }
-                                                            else if (User.Status == UserStatus.PasswordPending)
-                                                            {
-                                                                <PasswordChangeView></PasswordChangeView>
-                                                            }
-                                                            else if (User.Status == UserStatus.DataPending)
-                                                            {
-                                                                <UserDataSetView></UserDataSetView>
-                                                            }
-                                                            else
-                                                            {
-                                                                <RenderPermissionChecker>
-                                                                    @Body
-                                                                </RenderPermissionChecker>
-
-                                                                <RatingPopup/>
-                                                            }
-                                                        }
+                                                        <Login></Login>
                                                     }
                                                     else
                                                     {
-                                                        if (uri.LocalPath == "/login")
+                                                        if (IdentityService.User.Status == UserStatus.Banned)
                                                         {
-                                                            <Login></Login>
+                                                            <BannedAlert></BannedAlert>
                                                         }
-                                                        else if (uri.LocalPath == "/register")
+                                                        else if (IdentityService.User.Status == UserStatus.Disabled)
                                                         {
-                                                            <Register></Register>
+                                                            <DisabledAlert></DisabledAlert>
                                                         }
-                                                        else if (uri.LocalPath == "/passwordreset")
+                                                        else if (IdentityService.User.Status == UserStatus.PasswordPending)
                                                         {
-                                                            <PasswordReset></PasswordReset>
+                                                            <PasswordChangeView></PasswordChangeView>
+                                                        }
+                                                        else if (IdentityService.User.Status == UserStatus.DataPending)
+                                                        {
+                                                            <UserDataSetView></UserDataSetView>
+                                                        }
+                                                        else
+                                                        {
+                                                            <RenderPermissionChecker>
+                                                                @Body
+                                                            </RenderPermissionChecker>
+
+                                                            <RatingPopup/>
                                                         }
                                                     }
                                                 }
                                                 else
                                                 {
-                                                    <div class="modal d-block">
-                                                        <div class="modal-dialog modal-dialog-centered mw-900px">
-                                                            <div class="modal-content">
-                                                                <div class="pt-2 modal-body py-lg-10 px-lg-10">
-                                                                    <h2>@(SmartTranslateService.Translate("Authenticating"))...</h2>
-                                                                    <p class="mt-3 fw-normal fs-6">@(SmartTranslateService.Translate("Verifying token, loading user data"))</p>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
+                                                    if (uri.LocalPath == "/login")
+                                                    {
+                                                        <Login></Login>
+                                                    }
+                                                    else if (uri.LocalPath == "/register")
+                                                    {
+                                                        <Register></Register>
+                                                    }
+                                                    else if (uri.LocalPath == "/passwordreset")
+                                                    {
+                                                        <PasswordReset></PasswordReset>
+                                                    }
                                                 }
                                             }
                                             else
@@ -138,38 +123,50 @@
                                                     <div class="modal-dialog modal-dialog-centered mw-900px">
                                                         <div class="modal-content">
                                                             <div class="pt-2 modal-body py-lg-10 px-lg-10">
-                                                                <h2>@(SmartTranslateService.Translate("Your ip has been banned"))</h2>
-                                                                <p class="mt-3 fw-normal fs-6">@(SmartTranslateService.Translate("Your ip address has been banned by an admin"))</p>
+                                                                <h2>@(SmartTranslateService.Translate("Authenticating"))...</h2>
+                                                                <p class="mt-3 fw-normal fs-6">@(SmartTranslateService.Translate("Verifying token, loading user data"))</p>
                                                             </div>
                                                         </div>
                                                     </div>
                                                 </div>
                                             }
-                                        </SoftErrorBoundary>
-                                    </div>
+                                        }
+                                        else
+                                        {
+                                            <div class="modal d-block">
+                                                <div class="modal-dialog modal-dialog-centered mw-900px">
+                                                    <div class="modal-content">
+                                                        <div class="pt-2 modal-body py-lg-10 px-lg-10">
+                                                            <h2>@(SmartTranslateService.Translate("Your ip has been banned"))</h2>
+                                                            <p class="mt-3 fw-normal fs-6">@(SmartTranslateService.Translate("Your ip address has been banned by an admin"))</p>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        }
+                                    </SoftErrorBoundary>
                                 </div>
                             </div>
                         </div>
-                        <Footer></Footer>
                     </div>
+                    <Footer></Footer>
                 </div>
             </div>
         </div>
-    </CascadingValue>
+    </div>
 </GlobalErrorBoundary>
 
 @code
 {
-    private User? User;
     private bool UserProcessed = false;
 
     private bool IsIpBanned = false;
 
     protected override void OnAfterRender(bool firstRender)
     {
-        if(firstRender)
+        if (firstRender)
             AddBodyAttribute("data-kt-app-page-loading", "on");
-        
+
     //Initialize classes and attributes for layout with dark sidebar
         AddBodyAttribute("data-kt-app-reset-transition", "true");
 
@@ -204,7 +201,7 @@
                     NavigationManager.NavigateTo(NavigationManager.Uri, true);
                 });
 
-                User = await IdentityService.Get();
+                await IdentityService.Load();
                 UserProcessed = true;
                 await InvokeAsync(StateHasChanged);
 
@@ -215,7 +212,10 @@
                     await JsRuntime.InvokeVoidAsync("KTMenu.createInstances");
                     await JsRuntime.InvokeVoidAsync("KTDrawer.createInstances");
                 }
-                catch (Exception){ /* ignore errors to make sure that the session call is executed */ }
+                catch (Exception)
+                {
+    /* ignore errors to make sure that the session call is executed */
+                }
 
                 await SessionClientService.Start();
 
@@ -225,14 +225,14 @@
                         await DynamicBackgroundService.Reset();
                 };
 
-                if (User != null)
+                if (IdentityService.User != null)
                 {
                     await Event.On<SupportChatMessage>(
-                        $"supportChat.{User.Id}.message",
+                        $"supportChat.{IdentityService.User.Id}.message",
                         this,
                         async message =>
                         {
-                            if (!NavigationManager.Uri.EndsWith("/support") && message.Sender != User)
+                            if (!NavigationManager.Uri.EndsWith("/support") && message.Sender != IdentityService.User)
                             {
                                 await ToastService.Info($"Support: {message.Content}");
                             }
@@ -259,9 +259,9 @@
 
         await KeyListenerService.DisposeAsync();
 
-        if (User != null)
+        if (IdentityService.User != null)
         {
-            await Event.Off($"supportChat.{User.Id}.message", this);
+            await Event.Off($"supportChat.{IdentityService.User.Id}.message", this);
         }
     }
 
diff --git a/Moonlight/Shared/Layouts/NotFoundLayout.razor b/Moonlight/Shared/Layouts/NotFoundLayout.razor
index 7f0a1584..479866a0 100644
--- a/Moonlight/Shared/Layouts/NotFoundLayout.razor
+++ b/Moonlight/Shared/Layouts/NotFoundLayout.razor
@@ -60,8 +60,6 @@
 
 @code
 {
-    private User? User;
-
     protected override void OnInitialized()
     {
         AddBodyAttribute("data-kt-app-page-loading", "on");
@@ -95,7 +93,7 @@
         {
             try
             {
-                User = await IdentityService.Get();
+                await IdentityService.Load();
 
                 await InvokeAsync(StateHasChanged);
                 await Task.Delay(300);
diff --git a/Moonlight/Shared/Views/Admin/Databases/Index.razor b/Moonlight/Shared/Views/Admin/Databases/Index.razor
deleted file mode 100644
index 4b858ad2..00000000
--- a/Moonlight/Shared/Views/Admin/Databases/Index.razor
+++ /dev/null
@@ -1,5 +0,0 @@
-@page "/admin/databases"
-
-<OnlyAdmin>
-    
-</OnlyAdmin>
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Admin/Domains/Index.razor b/Moonlight/Shared/Views/Admin/Domains/Index.razor
index 856f2f11..ef3fafe4 100644
--- a/Moonlight/Shared/Views/Admin/Domains/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Domains/Index.razor
@@ -9,59 +9,59 @@
 @inject DomainService DomainService
 @inject SmartTranslateService SmartTranslateService
 
-<OnlyAdmin>
-    <LazyLoader @ref="LazyLoader" Load="Load">
-        <div class="row">
-            <div class="card">
-                <div class="card-header border-0 pt-5">
-                    <h3 class="card-title align-items-start flex-column">
-                        <span class="card-label fw-bold fs-3 mb-1">
-                            <TL>Domains</TL>
-                        </span>
-                    </h3>
-                    <div class="card-toolbar">
-                        <a href="/admin/domains/new" class="btn btn-sm btn-light-success">
-                            <i class="bx bx-layer-plus"></i>
-                            <TL>New domain</TL>
-                        </a>
-                    </div>
+@attribute [PermissionRequired(nameof(Permissions.AdminDomains))]
+
+<LazyLoader @ref="LazyLoader" Load="Load">
+    <div class="row">
+        <div class="card">
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bold fs-3 mb-1">
+                        <TL>Domains</TL>
+                    </span>
+                </h3>
+                <div class="card-toolbar">
+                    <a href="/admin/domains/new" class="btn btn-sm btn-light-success">
+                        <i class="bx bx-layer-plus"></i>
+                        <TL>New domain</TL>
+                    </a>
                 </div>
-                <div class="card-body pt-0">
-                    <div class="table-responsive">
-                        <Table TableItem="Domain" Items="Domains" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                            <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true" Width="10%"/>
-                            <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true" Width="10%"/>
-                            <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Shared domain"))" Field="@(x => x.SharedDomain)" Sortable="true" Filterable="true" Width="10%">
-                                <Template>
-                                    <span>@(context.SharedDomain.Name)</span>
-                                </Template>
-                            </Column>
-                            <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Owner"))" Field="@(x => x.Owner)" Sortable="true" Filterable="true" Width="10%">
-                                <Template>
-                                    <a href="/admin/users/view/@(context.Owner.Id)">@(context.Owner.Email)</a>
-                                </Template>
-                            </Column>
-                            <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Manage"))" Field="@(x => x.Id)" Sortable="false" Filterable="false" Width="10%">
-                                <Template>
-                                    <a href="/domain/@(context.Id)">Manage</a>
-                                </Template>
-                            </Column>
-                            <Column TableItem="Domain" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false" Width="10%">
-                                <Template>
-                                    <DeleteButton Confirm="true"
-                                                  AdditionalCssClasses="float-end"
-                                                  OnClick="() => Delete(context)">
-                                    </DeleteButton>
-                                </Template>
-                            </Column>
-                            <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                        </Table>
-                    </div>
+            </div>
+            <div class="card-body pt-0">
+                <div class="table-responsive">
+                    <Table TableItem="Domain" Items="Domains" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                        <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true" Width="10%"/>
+                        <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true" Width="10%"/>
+                        <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Shared domain"))" Field="@(x => x.SharedDomain)" Sortable="true" Filterable="true" Width="10%">
+                            <Template>
+                                <span>@(context.SharedDomain.Name)</span>
+                            </Template>
+                        </Column>
+                        <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Owner"))" Field="@(x => x.Owner)" Sortable="true" Filterable="true" Width="10%">
+                            <Template>
+                                <a href="/admin/users/view/@(context.Owner.Id)">@(context.Owner.Email)</a>
+                            </Template>
+                        </Column>
+                        <Column TableItem="Domain" Title="@(SmartTranslateService.Translate("Manage"))" Field="@(x => x.Id)" Sortable="false" Filterable="false" Width="10%">
+                            <Template>
+                                <a href="/domain/@(context.Id)">Manage</a>
+                            </Template>
+                        </Column>
+                        <Column TableItem="Domain" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false" Width="10%">
+                            <Template>
+                                <DeleteButton Confirm="true"
+                                              AdditionalCssClasses="float-end"
+                                              OnClick="() => Delete(context)">
+                                </DeleteButton>
+                            </Template>
+                        </Column>
+                        <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                    </Table>
                 </div>
             </div>
         </div>
-    </LazyLoader>
-</OnlyAdmin>
+    </div>
+</LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Domains/New.razor b/Moonlight/Shared/Views/Admin/Domains/New.razor
index 0b08c4c0..ee86d2d5 100644
--- a/Moonlight/Shared/Views/Admin/Domains/New.razor
+++ b/Moonlight/Shared/Views/Admin/Domains/New.razor
@@ -11,8 +11,9 @@
 @inject NavigationManager NavigationManager
 @inject DomainService DomainService
 
-<OnlyAdmin>
-    <div class="row mb-5">
+@attribute [PermissionRequired(nameof(Permissions.AdminNewDomain))]
+
+<div class="row mb-5">
         <div class="card card-body p-10">
             <LazyLoader Load="Load">
                 <SmartForm Model="Model" OnValidSubmit="Add">
@@ -48,7 +49,6 @@
             </LazyLoader>
         </div>
     </div>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Domains/Shared/Index.razor b/Moonlight/Shared/Views/Admin/Domains/Shared/Index.razor
index 86a1d1c6..d6f11f3f 100644
--- a/Moonlight/Shared/Views/Admin/Domains/Shared/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Domains/Shared/Index.razor
@@ -12,39 +12,39 @@
 @inject AlertService AlertService
 @inject ToastService ToastService
 
-<OnlyAdmin>
-    <LazyLoader @ref="LazyLoader" Load="Load">
-        <div class="card">
-            <div class="card-header border-0 pt-5">
-                <h3 class="card-title align-items-start flex-column">
-                    <span class="card-label fw-bold fs-3 mb-1">
-                        <span><TL>Shared domains</TL></span>
-                    </span>
-                </h3>
-                <div class="card-toolbar">
-                    <a href="/admin/domains/shared/new" class="btn btn-sm btn-light-success">
-                        <i class="bx bx-layer-plus"></i>
-                        <span><TL>Add shared domain</TL></span>
-                    </a>
-                </div>
-            </div>
-            <div class="card-body">
-                <Table TableItem="SharedDomain" Items="SharedDomains" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                    <Column TableItem="SharedDomain" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true" Width="10%"/>
-                    <Column TableItem="SharedDomain" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true" Width="10%"/>
-                    <Column TableItem="SharedDomain" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false" Width="10%">
-                        <Template>
-                            <DeleteButton Confirm="true"
-                                          AdditionalCssClasses="float-end"
-                                          OnClick="() => Delete(context)">
-                            </DeleteButton>
-                        </Template>
-                    </Column>
-                </Table>
-            </div>
-        </div>
-    </LazyLoader>
-</OnlyAdmin>
+@attribute [PermissionRequired(nameof(Permissions.AdminSharedDomains))]
+
+<LazyLoader @ref="LazyLoader" Load="Load">
+                    <div class="card">
+                        <div class="card-header border-0 pt-5">
+                            <h3 class="card-title align-items-start flex-column">
+                                <span class="card-label fw-bold fs-3 mb-1">
+                                    <span><TL>Shared domains</TL></span>
+                                </span>
+                            </h3>
+                            <div class="card-toolbar">
+                                <a href="/admin/domains/shared/new" class="btn btn-sm btn-light-success">
+                                    <i class="bx bx-layer-plus"></i>
+                                    <span><TL>Add shared domain</TL></span>
+                                </a>
+                            </div>
+                        </div>
+                        <div class="card-body">
+                            <Table TableItem="SharedDomain" Items="SharedDomains" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                                <Column TableItem="SharedDomain" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true" Width="10%"/>
+                                <Column TableItem="SharedDomain" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true" Width="10%"/>
+                                <Column TableItem="SharedDomain" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false" Width="10%">
+                                    <Template>
+                                        <DeleteButton Confirm="true"
+                                                      AdditionalCssClasses="float-end"
+                                                      OnClick="() => Delete(context)">
+                                        </DeleteButton>
+                                    </Template>
+                                </Column>
+                            </Table>
+                        </div>
+                    </div>
+                </LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Domains/Shared/New.razor b/Moonlight/Shared/Views/Admin/Domains/Shared/New.razor
index 6d48f93f..e2426046 100644
--- a/Moonlight/Shared/Views/Admin/Domains/Shared/New.razor
+++ b/Moonlight/Shared/Views/Admin/Domains/Shared/New.razor
@@ -12,6 +12,8 @@
 @inject ToastService ToastService
 @inject NavigationManager NavigationManager
 
+@attribute [PermissionRequired(nameof(Permissions.AdminNewSharedDomain))]
+
 <LazyLoader Load="Load" @ref="LazyLoader">
     <div class="row mb-5">
         <div class="card card-body">
diff --git a/Moonlight/Shared/Views/Admin/Index.razor b/Moonlight/Shared/Views/Admin/Index.razor
index b8d1a686..cc75bee9 100644
--- a/Moonlight/Shared/Views/Admin/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Index.razor
@@ -5,7 +5,6 @@
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Helpers
 @using Moonlight.App.Models.Misc
-@using Moonlight.App.Perms
 @using Moonlight.App.Services
 @using Newtonsoft.Json
 
diff --git a/Moonlight/Shared/Views/Admin/Nodes/Ddos.razor b/Moonlight/Shared/Views/Admin/Nodes/Ddos.razor
index 4a73adae..9b626a0f 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/Ddos.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/Ddos.razor
@@ -15,61 +15,61 @@
 @inject SmartTranslateService SmartTranslateService
 @inject EventSystem Event
 
-<OnlyAdmin>
-    <AdminNodesNavigation Index="1"/>
+@attribute [PermissionRequired(nameof(Permissions.AdminNodeDdos))]
 
-    <LazyLoader @ref="LazyLoader" Load="Load">
-        <div class="card">
-            <div class="card-body pt-0">
-                <div class="table-responsive">
-                    <Table TableItem="DdosAttack" Items="DdosAttacks" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                        <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Status"))" Field="@(x => x.Ongoing)" Sortable="true" Filterable="true">
-                            <Template>
-                                @if (context.Ongoing)
-                                {
-                                    <TL>DDos attack started</TL>
-                                }
-                                else
-                                {
-                                    <TL>DDos attack stopped</TL>
-                                }
-                            </Template>
-                        </Column>
-                        <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Node"))" Field="@(x => x.Node)" Sortable="false" Filterable="false">
-                            <Template>
-                                <a href="/admin/nodes/view/@(context.Id)">
-                                    @(context.Node.Name)
-                                </a>
-                            </Template>
-                        </Column>
-                        <Column TableItem="DdosAttack" Title="Ip" Field="@(x => x.Ip)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Status"))" Field="@(x => x.Ongoing)" Sortable="true" Filterable="true">
-                            <Template>
-                                @if (context.Ongoing)
-                                {
-                                    @(context.Data)
-                                    <TL> packets</TL>
-                                }
-                                else
-                                {
-                                    @(context.Data)
-                                    <span> MB</span>
-                                }
-                            </Template>
-                        </Column>
-                        <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Date"))" Field="@(x => x.Ongoing)" Sortable="true" Filterable="true">
-                            <Template>
-                                @(Formatter.FormatDate(context.CreatedAt))
-                            </Template>
-                        </Column>
-                        <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                    </Table>
-                </div>
+<AdminNodesNavigation Index="1"/>
+
+<LazyLoader @ref="LazyLoader" Load="Load">
+    <div class="card">
+        <div class="card-body pt-0">
+            <div class="table-responsive">
+                <Table TableItem="DdosAttack" Items="DdosAttacks" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                    <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Status"))" Field="@(x => x.Ongoing)" Sortable="true" Filterable="true">
+                        <Template>
+                            @if (context.Ongoing)
+                            {
+                                <TL>DDos attack started</TL>
+                            }
+                            else
+                            {
+                                <TL>DDos attack stopped</TL>
+                            }
+                        </Template>
+                    </Column>
+                    <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Node"))" Field="@(x => x.Node)" Sortable="false" Filterable="false">
+                        <Template>
+                            <a href="/admin/nodes/view/@(context.Id)">
+                                @(context.Node.Name)
+                            </a>
+                        </Template>
+                    </Column>
+                    <Column TableItem="DdosAttack" Title="Ip" Field="@(x => x.Ip)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Status"))" Field="@(x => x.Ongoing)" Sortable="true" Filterable="true">
+                        <Template>
+                            @if (context.Ongoing)
+                            {
+                                @(context.Data)
+                                <TL> packets</TL>
+                            }
+                            else
+                            {
+                                @(context.Data)
+                                <span> MB</span>
+                            }
+                        </Template>
+                    </Column>
+                    <Column TableItem="DdosAttack" Title="@(SmartTranslateService.Translate("Date"))" Field="@(x => x.Ongoing)" Sortable="true" Filterable="true">
+                        <Template>
+                            @(Formatter.FormatDate(context.CreatedAt))
+                        </Template>
+                    </Column>
+                    <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                </Table>
             </div>
         </div>
-    </LazyLoader>
-</OnlyAdmin>
+    </div>
+</LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Nodes/Edit.razor b/Moonlight/Shared/Views/Admin/Nodes/Edit.razor
index 21b7a9cc..0700294d 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/Edit.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/Edit.razor
@@ -9,8 +9,9 @@
 @inject SmartTranslateService SmartTranslateService
 @inject NavigationManager NavigationManager
 
-<OnlyAdmin>
-    <LazyLoader Load="Load" @ref="LazyLoader">
+@attribute [PermissionRequired(nameof(Permissions.AdminNodeEdit))]
+
+<LazyLoader Load="Load" @ref="LazyLoader">
         @if (Node == null)
         {
             <div class="alert alert-warning">
@@ -149,7 +150,6 @@
             </div>
         }
     </LazyLoader>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Nodes/Index.razor b/Moonlight/Shared/Views/Admin/Nodes/Index.razor
index bdc40d22..b9f0dfc2 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/Index.razor
@@ -13,89 +13,89 @@
 @inject NodeService NodeService
 @inject SmartTranslateService SmartTranslateService
 
-<OnlyAdmin>
-    <AdminNodesNavigation Index="0"/>
+@attribute [PermissionRequired(nameof(Permissions.AdminNodes))]
 
-    <LazyLoader @ref="LazyLoader" Load="Load">
-        <div class="card">
-            <div class="card-header border-0 pt-5">
-                <h3 class="card-title align-items-start flex-column">
-                    <span class="card-label fw-bold fs-3 mb-1">
-                        <TL>Nodes</TL>
-                    </span>
-                </h3>
-                <div class="card-toolbar">
-                    <a href="/admin/nodes/new" class="btn btn-sm btn-light-success">
-                        <i class="bx bx-layer-plus"></i>
-                        <TL>New node</TL>
-                    </a>
-                </div>
-            </div>
-            <div class="card-body pt-0">
-                @if (Nodes.Any())
-                {
-                    <div class="table-responsive">
-                        <Table TableItem="Node" Items="Nodes" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                            <Column TableItem="Node" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
-                            <Column TableItem="Node" Title="@(SmartTranslateService.Translate("Status"))" Field="@(x => x.Id)" Sortable="true" Filterable="true">
-                                <Template>
-                                    @{
-                                        var ss = StatusCache.ContainsKey(context) ? StatusCache[context] : null;
-                                    }
+<AdminNodesNavigation Index="0"/>
 
-                                    @if (ss == null)
-                                    {
-                                        <span class="text-danger">Offline</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="text-success">Online (@(ss.Version))</span>
-                                    }
-                                </Template>
-                            </Column>
-                            <Column TableItem="Node" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true">
-                                <Template>
-                                    <a href="/admin/nodes/view/@(context.Id)">@(context.Name)</a>
-                                </Template>
-                            </Column>
-                            <Column TableItem="Node" Title="@(SmartTranslateService.Translate("Fqdn"))" Field="@(x => x.Fqdn)" Sortable="true" Filterable="true"/>
-                            <Column TableItem="Node" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                                <Template>
-                                    <a href="/admin/nodes/edit/@(context.Id)">
-                                        @(SmartTranslateService.Translate("Edit"))
-                                    </a>
-                                </Template>
-                            </Column>
-                            <Column TableItem="Node" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                                <Template>
-                                    <a href="/admin/nodes/setup/@(context.Id)">
-                                        @(SmartTranslateService.Translate("Setup"))
-                                    </a>
-                                </Template>
-                            </Column>
-                            <Column TableItem="Node" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                                <Template>
-                                    <WButton Text="@(SmartTranslateService.Translate("Delete"))"
-                                             WorkingText="@(SmartTranslateService.Translate("Deleting"))"
-                                             CssClasses="btn-sm btn-danger"
-                                             OnClick="() => Delete(context)">
-                                    </WButton>
-                                </Template>
-                            </Column>
-                            <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                        </Table>
-                    </div>
-                }
-                else
-                {
-                    <div class="alert alert-info">
-                        <TL>No nodes found</TL>
-                    </div>
-                }
+<LazyLoader @ref="LazyLoader" Load="Load">
+    <div class="card">
+        <div class="card-header border-0 pt-5">
+            <h3 class="card-title align-items-start flex-column">
+                <span class="card-label fw-bold fs-3 mb-1">
+                    <TL>Nodes</TL>
+                </span>
+            </h3>
+            <div class="card-toolbar">
+                <a href="/admin/nodes/new" class="btn btn-sm btn-light-success">
+                    <i class="bx bx-layer-plus"></i>
+                    <TL>New node</TL>
+                </a>
             </div>
         </div>
-    </LazyLoader>
-</OnlyAdmin>
+        <div class="card-body pt-0">
+            @if (Nodes.Any())
+            {
+                <div class="table-responsive">
+                    <Table TableItem="Node" Items="Nodes" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                        <Column TableItem="Node" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
+                        <Column TableItem="Node" Title="@(SmartTranslateService.Translate("Status"))" Field="@(x => x.Id)" Sortable="true" Filterable="true">
+                            <Template>
+                                @{
+                                    var ss = StatusCache.ContainsKey(context) ? StatusCache[context] : null;
+                                }
+
+                                @if (ss == null)
+                                {
+                                    <span class="text-danger">Offline</span>
+                                }
+                                else
+                                {
+                                    <span class="text-success">Online (@(ss.Version))</span>
+                                }
+                            </Template>
+                        </Column>
+                        <Column TableItem="Node" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true">
+                            <Template>
+                                <a href="/admin/nodes/view/@(context.Id)">@(context.Name)</a>
+                            </Template>
+                        </Column>
+                        <Column TableItem="Node" Title="@(SmartTranslateService.Translate("Fqdn"))" Field="@(x => x.Fqdn)" Sortable="true" Filterable="true"/>
+                        <Column TableItem="Node" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                            <Template>
+                                <a href="/admin/nodes/edit/@(context.Id)">
+                                    @(SmartTranslateService.Translate("Edit"))
+                                </a>
+                            </Template>
+                        </Column>
+                        <Column TableItem="Node" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                            <Template>
+                                <a href="/admin/nodes/setup/@(context.Id)">
+                                    @(SmartTranslateService.Translate("Setup"))
+                                </a>
+                            </Template>
+                        </Column>
+                        <Column TableItem="Node" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                            <Template>
+                                <WButton Text="@(SmartTranslateService.Translate("Delete"))"
+                                         WorkingText="@(SmartTranslateService.Translate("Deleting"))"
+                                         CssClasses="btn-sm btn-danger"
+                                         OnClick="() => Delete(context)">
+                                </WButton>
+                            </Template>
+                        </Column>
+                        <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                    </Table>
+                </div>
+            }
+            else
+            {
+                <div class="alert alert-info">
+                    <TL>No nodes found</TL>
+                </div>
+            }
+        </div>
+    </div>
+</LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Nodes/New.razor b/Moonlight/Shared/Views/Admin/Nodes/New.razor
index 6da5ae9f..d21a2bd0 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/New.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/New.razor
@@ -9,8 +9,9 @@
 @inject NodeRepository NodeRepository
 @inject NavigationManager NavigationManager
 
-<OnlyAdmin>
-    <div class="d-flex flex-center">
+@attribute [PermissionRequired(nameof(Permissions.AdminNewNode))]
+
+<div class="d-flex flex-center">
         <div class="card rounded-3 w-md-550px">
             <div class="card-body">
                 <div class="d-flex flex-center flex-column-fluid">
@@ -73,7 +74,6 @@
             </div>
         </div>
     </div>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Nodes/Setup.razor b/Moonlight/Shared/Views/Admin/Nodes/Setup.razor
index 1296259e..65d44019 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/Setup.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/Setup.razor
@@ -6,12 +6,13 @@
 @inject NodeRepository NodeRepository
 @inject ConfigService ConfigService
 
+@attribute [PermissionRequired(nameof(Permissions.AdminNodeSetup))]
+
 @{
     var appUrl = ConfigService.Get().Moonlight.AppUrl;
 }
 
-<OnlyAdmin>
-    <LazyLoader Load="Load">
+<LazyLoader Load="Load">
         @if (Node == null)
         {
             <div class="alert alert-warning">
@@ -141,7 +142,6 @@
             </div>
         }
     </LazyLoader>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Nodes/View.razor b/Moonlight/Shared/Views/Admin/Nodes/View.razor
index d4c59945..6b27e3f2 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/View.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/View.razor
@@ -10,7 +10,8 @@
 @inject NodeRepository NodeRepository
 @inject NodeService NodeService
 
-<OnlyAdmin>
+@attribute [PermissionRequired(nameof(Permissions.AdminNodeView))]
+
 <LazyLoader Load="Load">
 @if (Node == null)
 {
@@ -252,7 +253,6 @@ else
     </div>
 }
 </LazyLoader>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Notifications/Debugging.razor b/Moonlight/Shared/Views/Admin/Notifications/Debugging.razor
index 56ac22c4..da88d774 100644
--- a/Moonlight/Shared/Views/Admin/Notifications/Debugging.razor
+++ b/Moonlight/Shared/Views/Admin/Notifications/Debugging.razor
@@ -12,8 +12,9 @@
 
 @implements IDisposable
 
-<OnlyAdmin>
-    <LazyLoader Load="Load">
+@attribute [PermissionRequired(nameof(Permissions.AdminNotificationDebugging))]
+
+<LazyLoader Load="Load">
         <div class="card card-body">
             <Table TableItem="ActiveNotificationClient" Items="Clients" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
                 <Column TableItem="ActiveNotificationClient" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Client.Id)" Sortable="false" Filterable="true"/>
@@ -31,8 +32,6 @@
             </Table>
         </div>
     </LazyLoader>
-</OnlyAdmin>
-
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor
index 8104762b..888060a0 100644
--- a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor
@@ -7,8 +7,9 @@
 
 @implements IDisposable
 
-<OnlyAdmin>
-    <div class="row g-5 g-xl-10 mb-5 mb-xl-10">
+@attribute [PermissionRequired(nameof(Permissions.AdminServerCleanup))]
+
+<div class="row g-5 g-xl-10 mb-5 mb-xl-10">
         <div class="col-xl-3">
             <div class="card card-flush bgi-no-repeat bgi-size-contain bgi-position-x-end h-xl-100" style="background-color: #170049;">
                 <div class="card-header pt-5 mb-3">
@@ -76,7 +77,6 @@
             </div>
         </div>
     </div>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Servers/Edit.razor b/Moonlight/Shared/Views/Admin/Servers/Edit.razor
index 2014c193..5eeeb55b 100644
--- a/Moonlight/Shared/Views/Admin/Servers/Edit.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/Edit.razor
@@ -13,165 +13,165 @@
 @inject ImageRepository ImageRepository
 @inject Repository<User> UserRepository
 
-<OnlyAdmin>
-    <LazyLoader @ref="LazyLoader" Load="Load">
-        @if (Server == null)
-        {
-            <div class="alert alert-danger">
-                <TL>No server with this id found</TL>
-            </div>
-        }
-        else
-        {
-            <SmartForm Model="Model" OnValidSubmit="OnValidSubmit">
-                <div class="row mb-5">
-                    <div class="card card-body p-10">
-                        <label class="form-label">
-                            <TL>Identifier</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <span class="input-group-text">
-                                <i class="bx bx-id-card"></i>
-                            </span>
-                            <input type="number" class="form-control disabled" disabled="" value="@(Server.Id)">
-                        </div>
-                        <label class="form-label">
-                            <TL>UuidIdentifier</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <span class="input-group-text">
-                                <i class="bx bx-id-card"></i>
-                            </span>
-                            <input type="text" class="form-control disabled" disabled="" value="@(Server.Uuid)">
-                        </div>
-                        <label class="form-label">
-                            <TL>Server name</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <span class="input-group-text">
-                                <i class="bx bx-purchase-tag-alt"></i>
-                            </span>
-                            <InputText @bind-Value="Model.Name" type="text" class="form-control" placeholder="@(SmartTranslateService.Translate("Server name"))"></InputText>
-                        </div>
-                        <label class="form-label">
-                            <TL>Owner</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <SmartDropdown T="User"
-                                           @bind-Value="Model.Owner"
-                                           Items="Users"
-                                           DisplayFunc="@(x => x.Email)"
-                                           SearchProp="@(x => x.Email)">
-                            </SmartDropdown>
-                        </div>
-                    </div>
-                </div>
-                <div class="row mb-5">
-                    <div class="card card-body p-10">
-                        <label class="form-label">
-                            <TL>Cpu cores</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <span class="input-group-text">
-                                <i class="bx bx-chip"></i>
-                            </span>
-                            <InputNumber @bind-Value="Model.Cpu" type="number" class="form-control"></InputNumber>
-                            <span class="input-group-text">
-                                <TL>CPU Cores (100% = 1 Core)</TL>
-                            </span>
-                        </div>
-                        <label class="form-label">
-                            <TL>Memory</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <span class="input-group-text">
-                                <i class="bx bx-microchip"></i>
-                            </span>
-                            <InputNumber @bind-Value="Model.Memory" type="number" class="form-control"></InputNumber>
-                            <span class="input-group-text">
-                                MB
-                            </span>
-                        </div>
-                        <label class="form-label">
-                            <TL>Disk</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <span class="input-group-text">
-                                <i class="bx bx-hdd"></i>
-                            </span>
-                            <InputNumber @bind-Value="Model.Disk" type="number" class="form-control"></InputNumber>
-                            <span class="input-group-text">
-                                MB
-                            </span>
-                        </div>
-                    </div>
-                </div>
-                <div class="row mb-5">
-                    <div class="card card-body p-10">
-                        <label class="form-label">
-                            <TL>Override startup command</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <span class="input-group-text">
-                                <i class="bx bx-terminal"></i>
-                            </span>
-                            <InputText @bind-Value="Model.OverrideStartup" type="text" class="form-control" placeholder="@(Server.Image.Startup)"></InputText>
-                        </div>
-                        <label class="form-label">
-                            <TL>Docker image</TL>
-                        </label>
-                        <select @bind="Model.DockerImageIndex" class="form-select">
-                            @foreach (var image in DockerImages)
-                            {
-                                <option value="@(DockerImages.IndexOf(image))">@(image.Name)</option>
-                            }
-                        </select>
-                        <label class="form-label">
-                            <TL>Cleanup exception</TL>
-                        </label>
-                        <input @bind="Model.IsCleanupException" class="form-check" type="checkbox"/>
-                    </div>
-                </div>
-                <div class="row mb-5">
-                    @foreach (var vars in Server.Variables.Chunk(4))
+@attribute [PermissionRequired(nameof(Permissions.AdminServerEdit))]
+
+<LazyLoader @ref="LazyLoader" Load="Load">
+                    @if (Server == null)
                     {
-                        <div class="row mb-3">
-                            @foreach (var variable in vars)
-                            {
-                                <div class="col">
-                                    <div class="card card-body">
-                                        <label class="form-label">
-                                            <TL>Name</TL>
-                                        </label>
-                                        <div class="input-group mb-5">
-                                            <input @bind="variable.Key" type="text" class="form-control disabled" disabled="">
-                                        </div>
-                                        <label class="form-label">
-                                            <TL>Value</TL>
-                                        </label>
-                                        <div class="input-group mb-5">
-                                            <input @bind="variable.Value" type="text" class="form-control">
-                                        </div>
-                                    </div>
-                                </div>
-                            }
+                        <div class="alert alert-danger">
+                            <TL>No server with this id found</TL>
                         </div>
                     }
-                </div>
-                <div class="row">
-                    <div class="card card-body">
-                        <div class="d-flex justify-content-end">
-                            <a href="/admin/servers/images" class="btn btn-danger me-3">
-                                <TL>Cancel</TL>
-                            </a>
-                            <button class="btn btn-success" type="submit"><TL>Save</TL></button>
-                        </div>
-                    </div>
-                </div>
-            </SmartForm>
-        }
-    </LazyLoader>
-</OnlyAdmin>
+                    else
+                    {
+                        <SmartForm Model="Model" OnValidSubmit="OnValidSubmit">
+                            <div class="row mb-5">
+                                <div class="card card-body p-10">
+                                    <label class="form-label">
+                                        <TL>Identifier</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <span class="input-group-text">
+                                            <i class="bx bx-id-card"></i>
+                                        </span>
+                                        <input type="number" class="form-control disabled" disabled="" value="@(Server.Id)">
+                                    </div>
+                                    <label class="form-label">
+                                        <TL>UuidIdentifier</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <span class="input-group-text">
+                                            <i class="bx bx-id-card"></i>
+                                        </span>
+                                        <input type="text" class="form-control disabled" disabled="" value="@(Server.Uuid)">
+                                    </div>
+                                    <label class="form-label">
+                                        <TL>Server name</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <span class="input-group-text">
+                                            <i class="bx bx-purchase-tag-alt"></i>
+                                        </span>
+                                        <InputText @bind-Value="Model.Name" type="text" class="form-control" placeholder="@(SmartTranslateService.Translate("Server name"))"></InputText>
+                                    </div>
+                                    <label class="form-label">
+                                        <TL>Owner</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <SmartDropdown T="User"
+                                                       @bind-Value="Model.Owner"
+                                                       Items="Users"
+                                                       DisplayFunc="@(x => x.Email)"
+                                                       SearchProp="@(x => x.Email)">
+                                        </SmartDropdown>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row mb-5">
+                                <div class="card card-body p-10">
+                                    <label class="form-label">
+                                        <TL>Cpu cores</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <span class="input-group-text">
+                                            <i class="bx bx-chip"></i>
+                                        </span>
+                                        <InputNumber @bind-Value="Model.Cpu" type="number" class="form-control"></InputNumber>
+                                        <span class="input-group-text">
+                                            <TL>CPU Cores (100% = 1 Core)</TL>
+                                        </span>
+                                    </div>
+                                    <label class="form-label">
+                                        <TL>Memory</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <span class="input-group-text">
+                                            <i class="bx bx-microchip"></i>
+                                        </span>
+                                        <InputNumber @bind-Value="Model.Memory" type="number" class="form-control"></InputNumber>
+                                        <span class="input-group-text">
+                                            MB
+                                        </span>
+                                    </div>
+                                    <label class="form-label">
+                                        <TL>Disk</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <span class="input-group-text">
+                                            <i class="bx bx-hdd"></i>
+                                        </span>
+                                        <InputNumber @bind-Value="Model.Disk" type="number" class="form-control"></InputNumber>
+                                        <span class="input-group-text">
+                                            MB
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row mb-5">
+                                <div class="card card-body p-10">
+                                    <label class="form-label">
+                                        <TL>Override startup command</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <span class="input-group-text">
+                                            <i class="bx bx-terminal"></i>
+                                        </span>
+                                        <InputText @bind-Value="Model.OverrideStartup" type="text" class="form-control" placeholder="@(Server.Image.Startup)"></InputText>
+                                    </div>
+                                    <label class="form-label">
+                                        <TL>Docker image</TL>
+                                    </label>
+                                    <select @bind="Model.DockerImageIndex" class="form-select">
+                                        @foreach (var image in DockerImages)
+                                        {
+                                            <option value="@(DockerImages.IndexOf(image))">@(image.Name)</option>
+                                        }
+                                    </select>
+                                    <label class="form-label">
+                                        <TL>Cleanup exception</TL>
+                                    </label>
+                                    <input @bind="Model.IsCleanupException" class="form-check" type="checkbox"/>
+                                </div>
+                            </div>
+                            <div class="row mb-5">
+                                @foreach (var vars in Server.Variables.Chunk(4))
+                                {
+                                    <div class="row mb-3">
+                                        @foreach (var variable in vars)
+                                        {
+                                            <div class="col">
+                                                <div class="card card-body">
+                                                    <label class="form-label">
+                                                        <TL>Name</TL>
+                                                    </label>
+                                                    <div class="input-group mb-5">
+                                                        <input @bind="variable.Key" type="text" class="form-control disabled" disabled="">
+                                                    </div>
+                                                    <label class="form-label">
+                                                        <TL>Value</TL>
+                                                    </label>
+                                                    <div class="input-group mb-5">
+                                                        <input @bind="variable.Value" type="text" class="form-control">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        }
+                                    </div>
+                                }
+                            </div>
+                            <div class="row">
+                                <div class="card card-body">
+                                    <div class="d-flex justify-content-end">
+                                        <a href="/admin/servers/images" class="btn btn-danger me-3">
+                                            <TL>Cancel</TL>
+                                        </a>
+                                        <button class="btn btn-success" type="submit"><TL>Save</TL></button>
+                                    </div>
+                                </div>
+                            </div>
+                        </SmartForm>
+                    }
+                </LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Servers/Index.razor b/Moonlight/Shared/Views/Admin/Servers/Index.razor
index 2e5517c6..8a967184 100644
--- a/Moonlight/Shared/Views/Admin/Servers/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/Index.razor
@@ -8,7 +8,7 @@
 @inject ServerRepository ServerRepository
 @inject SmartTranslateService SmartTranslateService
 
-@attribute [PermissionRequired(nameof(Permissions.ServersOverview))]
+@attribute [PermissionRequired(nameof(Permissions.AdminServers))]
 
 <div class="row">
     <LazyLoader Load="Load">
diff --git a/Moonlight/Shared/Views/Admin/Servers/Manager.razor b/Moonlight/Shared/Views/Admin/Servers/Manager.razor
index c30d7142..f91ba4fa 100644
--- a/Moonlight/Shared/Views/Admin/Servers/Manager.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/Manager.razor
@@ -18,86 +18,86 @@
 @inject AlertService AlertService
 @inject ServerService ServerService
 
-<OnlyAdmin>
-    <div class="card mb-5">
-        <div class="card-body">
-            <WButton Text="@(SmartTranslateService.Translate("Refresh"))"
-                     WorkingText="@(SmartTranslateService.Translate("Working"))"
-                     CssClasses="btn-primary"
-                     OnClick="() => Task.Run(Scan)">
-            </WButton>
-            <WButton Text="@(SmartTranslateService.Translate("Stop all"))"
-                     WorkingText="@(SmartTranslateService.Translate("Working"))"
-                     CssClasses="btn-danger"
-                     OnClick="StopAll">
-            </WButton>
-            <WButton Text="@(SmartTranslateService.Translate("Kill all"))"
-                     WorkingText="@(SmartTranslateService.Translate("Working"))"
-                     CssClasses="btn-danger"
-                     OnClick="KillAll">
-            </WButton>
-        </div>
+@attribute [PermissionRequired(nameof(Permissions.AdminServerManager))]
+
+<div class="card mb-5">
+    <div class="card-body">
+        <WButton Text="@(SmartTranslateService.Translate("Refresh"))"
+                 WorkingText="@(SmartTranslateService.Translate("Working"))"
+                 CssClasses="btn-primary"
+                 OnClick="() => Task.Run(Scan)">
+        </WButton>
+        <WButton Text="@(SmartTranslateService.Translate("Stop all"))"
+                 WorkingText="@(SmartTranslateService.Translate("Working"))"
+                 CssClasses="btn-danger"
+                 OnClick="StopAll">
+        </WButton>
+        <WButton Text="@(SmartTranslateService.Translate("Kill all"))"
+                 WorkingText="@(SmartTranslateService.Translate("Working"))"
+                 CssClasses="btn-danger"
+                 OnClick="KillAll">
+        </WButton>
     </div>
-    <div class="card mb-5 bg-secondary">
-        <div class="card-body d-flex align-items-center">
-            @if (IsRunning)
-            {
-                <h4><TL>Currently scanning</TL>: @(Node?.Name)</h4>
-            }
-            else
-            {
-                <TL>Scan complete</TL>
-            }
-        </div>
+</div>
+<div class="card mb-5 bg-secondary">
+    <div class="card-body d-flex align-items-center">
+        @if (IsRunning)
+        {
+            <h4><TL>Currently scanning</TL>: @(Node?.Name)</h4>
+        }
+        else
+        {
+            <TL>Scan complete</TL>
+        }
     </div>
-    <div class="card card-body">
-        <div class="table-responsive">
-            <Table TableItem="RunningServer" Items="RunningServers" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Server.Name)" Sortable="true" Filterable="true">
-                    <Template>
-                        <a href="/server/@(context.Server.Uuid)">@(context.Server.Name)</a>
-                    </Template>
-                </Column>
-                <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Cpu usage"))" Field="@(x => x.Container.Cpu)" Sortable="true" Filterable="true">
-                    <Template>
-                        <span>@(context.Container.Cpu)%</span>
-                    </Template>
-                </Column>
-                <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Memory usage"))" Field="@(x => x.Container.Memory)" Sortable="true" Filterable="true">
-                    <Template>
-                        <span>@(Formatter.FormatSize(context.Container.Memory))</span>
-                    </Template>
-                </Column>
-                <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Network in"))" Field="@(x => x.Container.NetworkIn)" Sortable="true" Filterable="true">
-                    <Template>
-                        <span>@(Formatter.FormatSize(context.Container.NetworkIn))</span>
-                    </Template>
-                </Column>
-                <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Network out"))" Field="@(x => x.Container.NetworkOut)" Sortable="true" Filterable="true">
-                    <Template>
-                        <span>@(Formatter.FormatSize(context.Container.NetworkOut))</span>
-                    </Template>
-                </Column>
-                <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Image"))" Field="@(x => x.Server.Image.Name)" Sortable="true" Filterable="true">
-                    <Template>
-                        <a href="/admin/servers/images/edit/@(context.Server.Image.Id)">@(context.Server.Image.Name)</a>
-                    </Template>
-                </Column>
-                <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Node"))" Field="@(x => x.Server.Node.Name)" Sortable="true" Filterable="true">
-                    <Template>
-                        <a href="/admin/nodes/view/@(context.Server.Node.Id)">@(context.Server.Node.Name)</a>
-                    </Template>
-                </Column>
-                <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Owner"))" Field="@(x => x.Server.Owner.Email)" Sortable="true" Filterable="true">
-                    <Template>
-                        <a href="/admin/users/view/@(context.Server.Owner.Id)/">@context.Server.Owner.Email</a>
-                    </Template>
-                </Column>
-                <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-            </Table>
-        </div>
+</div>
+<div class="card card-body">
+    <div class="table-responsive">
+        <Table TableItem="RunningServer" Items="RunningServers" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+            <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Server.Name)" Sortable="true" Filterable="true">
+                <Template>
+                    <a href="/server/@(context.Server.Uuid)">@(context.Server.Name)</a>
+                </Template>
+            </Column>
+            <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Cpu usage"))" Field="@(x => x.Container.Cpu)" Sortable="true" Filterable="true">
+                <Template>
+                    <span>@(context.Container.Cpu)%</span>
+                </Template>
+            </Column>
+            <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Memory usage"))" Field="@(x => x.Container.Memory)" Sortable="true" Filterable="true">
+                <Template>
+                    <span>@(Formatter.FormatSize(context.Container.Memory))</span>
+                </Template>
+            </Column>
+            <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Network in"))" Field="@(x => x.Container.NetworkIn)" Sortable="true" Filterable="true">
+                <Template>
+                    <span>@(Formatter.FormatSize(context.Container.NetworkIn))</span>
+                </Template>
+            </Column>
+            <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Network out"))" Field="@(x => x.Container.NetworkOut)" Sortable="true" Filterable="true">
+                <Template>
+                    <span>@(Formatter.FormatSize(context.Container.NetworkOut))</span>
+                </Template>
+            </Column>
+            <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Image"))" Field="@(x => x.Server.Image.Name)" Sortable="true" Filterable="true">
+                <Template>
+                    <a href="/admin/servers/images/edit/@(context.Server.Image.Id)">@(context.Server.Image.Name)</a>
+                </Template>
+            </Column>
+            <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Node"))" Field="@(x => x.Server.Node.Name)" Sortable="true" Filterable="true">
+                <Template>
+                    <a href="/admin/nodes/view/@(context.Server.Node.Id)">@(context.Server.Node.Name)</a>
+                </Template>
+            </Column>
+            <Column TableItem="RunningServer" Title="@(SmartTranslateService.Translate("Owner"))" Field="@(x => x.Server.Owner.Email)" Sortable="true" Filterable="true">
+                <Template>
+                    <a href="/admin/users/view/@(context.Server.Owner.Id)/">@context.Server.Owner.Email</a>
+                </Template>
+            </Column>
+            <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+        </Table>
     </div>
-</OnlyAdmin>
+</div>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Servers/New.razor b/Moonlight/Shared/Views/Admin/Servers/New.razor
index d0c7281d..c45e94bf 100644
--- a/Moonlight/Shared/Views/Admin/Servers/New.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/New.razor
@@ -17,163 +17,163 @@
 @inject NavigationManager NavigationManager
 @inject UserRepository UserRepository
 
-<OnlyAdmin>
-    <LazyLoader Load="Load">
-        <SmartForm Model="Model" OnValidSubmit="Create">
-            <div class="row mb-5">
-                <div class="card card-body p-10">
-                    <label class="form-label">
-                        <TL>Server name</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <span class="input-group-text">
-                            <i class="bx bx-purchase-tag-alt"></i>
-                        </span>
-                        <InputText @bind-Value="Model.Name" type="text" class="form-control" placeholder="@(SmartTranslateService.Translate("Server name"))"></InputText>
-                    </div>
-                    <label class="form-label">
-                        <TL>Owner</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <SmartDropdown
-                            @bind-Value="Model.Owner"
-                            Items="Users"
-                            DisplayFunc="@(x => x.Email)"
-                            SearchProp="@(x => x.Email)">
-                        </SmartDropdown>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-5">
-                <div class="card card-body p-10">
-                    <label class="form-label">
-                        <TL>Cpu cores</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <span class="input-group-text">
-                            <i class="bx bx-chip"></i>
-                        </span>
-                        <InputNumber @bind-Value="Model.Cpu" class="form-control"></InputNumber>
-                        <span class="input-group-text">
-                            <TL>CPU Cores (100% = 1 Core)</TL>
-                        </span>
-                    </div>
-                    <label class="form-label">
-                        <TL>Memory</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <span class="input-group-text">
-                            <i class="bx bx-microchip"></i>
-                        </span>
-                        <InputNumber @bind-Value="Model.Memory" class="form-control"></InputNumber>
-                        <span class="input-group-text">
-                            MB
-                        </span>
-                    </div>
-                    <label class="form-label">
-                        <TL>Disk</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <span class="input-group-text">
-                            <i class="bx bx-hdd"></i>
-                        </span>
-                        <InputNumber @bind-Value="Model.Disk" class="form-control"></InputNumber>
-                        <span class="input-group-text">
-                            MB
-                        </span>
-                    </div>
-                    <label class="form-label">
-                        <TL>Node</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <SmartSelect @bind-Value="Model.Node"
-                                     Items="Nodes"
-                                     DisplayField="@(x => x.Name)">
-                        </SmartSelect>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-5">
-                <div class="card card-body p-10">
-                    <label class="form-label">
-                        <TL>Image</TL>
-                    </label>
-                    <div class="mb-5">
-                        <SmartSelect TField="Image" @bind-Value="Model.Image" Items="Images" DisplayField="@(x => x.Name)" OnChange="OnChange"></SmartSelect>
-                    </div>
-                    @if (Model.Image != null)
-                    {
-                        <label class="form-label">
-                            <TL>Override startup</TL>
-                        </label>
-                        <div class="input-group mb-5">
-                            <span class="input-group-text">
-                                <i class="bx bx-terminal"></i>
-                            </span>
-                            <InputText @bind-Value="Model.OverrideStartup" type="text" class="form-control" placeholder="@(Model.Image.Startup)"></InputText>
-                        </div>
-                        <label class="form-label">
-                            <TL>Docker image</TL>
-                        </label>
-                        <InputSelect TValue="int" @bind-Value="Model.DockerImageIndex" class="form-control">
-                            @foreach (var image in Model.Image.DockerImages)
-                            {
-                                <option value="@(Model.Image.DockerImages.IndexOf(image))">@(image.Name)</option>
-                            }
-                        </InputSelect>
-                    }
-                </div>
-            </div>
+@attribute [PermissionRequired(nameof(Permissions.AdminNewServer))]
 
-            <div class="row mb-5">
-                <div class="card card-body">
-                    @if (Model.Image != null)
-                    {
-                        <div class="mt-9 row d-flex">
-                            @foreach (var vars in ServerVariables.Chunk(3))
-                            {
-                                <div class="row row-cols-3 mb-3">
-                                    @foreach (var variable in vars)
-                                    {
-                                        <div class="col">
-                                            <div class="card card-body border">
-                                                <label class="form-label">
-                                                    <TL>Name</TL>
-                                                </label>
-                                                <div class="input-group mb-5">
-                                                    <input @bind="variable.Key" type="text" class="form-control disabled" disabled="">
-                                                </div>
-                                                <label class="form-label">
-                                                    <TL>Value</TL>
-                                                </label>
-                                                <div class="input-group mb-5">
-                                                    <input @bind="variable.Value" type="text" class="form-control">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    }
+<LazyLoader Load="Load">
+                    <SmartForm Model="Model" OnValidSubmit="Create">
+                        <div class="row mb-5">
+                            <div class="card card-body p-10">
+                                <label class="form-label">
+                                    <TL>Server name</TL>
+                                </label>
+                                <div class="input-group mb-5">
+                                    <span class="input-group-text">
+                                        <i class="bx bx-purchase-tag-alt"></i>
+                                    </span>
+                                    <InputText @bind-Value="Model.Name" type="text" class="form-control" placeholder="@(SmartTranslateService.Translate("Server name"))"></InputText>
                                 </div>
-                            }
+                                <label class="form-label">
+                                    <TL>Owner</TL>
+                                </label>
+                                <div class="input-group mb-5">
+                                    <SmartDropdown
+                                        @bind-Value="Model.Owner"
+                                        Items="Users"
+                                        DisplayFunc="@(x => x.Email)"
+                                        SearchProp="@(x => x.Email)">
+                                    </SmartDropdown>
+                                </div>
+                            </div>
                         </div>
-                    }
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="card card-body">
-                    <div class="d-flex justify-content-end">
-                        <a href="/admin/servers" class="btn btn-danger me-3">
-                            <TL>Cancel</TL>
-                        </a>
-                        <button class="btn btn-success" type="submit">
-                            <TL>Create</TL>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </SmartForm>
-    </LazyLoader>
-</OnlyAdmin>
+                        <div class="row mb-5">
+                            <div class="card card-body p-10">
+                                <label class="form-label">
+                                    <TL>Cpu cores</TL>
+                                </label>
+                                <div class="input-group mb-5">
+                                    <span class="input-group-text">
+                                        <i class="bx bx-chip"></i>
+                                    </span>
+                                    <InputNumber @bind-Value="Model.Cpu" class="form-control"></InputNumber>
+                                    <span class="input-group-text">
+                                        <TL>CPU Cores (100% = 1 Core)</TL>
+                                    </span>
+                                </div>
+                                <label class="form-label">
+                                    <TL>Memory</TL>
+                                </label>
+                                <div class="input-group mb-5">
+                                    <span class="input-group-text">
+                                        <i class="bx bx-microchip"></i>
+                                    </span>
+                                    <InputNumber @bind-Value="Model.Memory" class="form-control"></InputNumber>
+                                    <span class="input-group-text">
+                                        MB
+                                    </span>
+                                </div>
+                                <label class="form-label">
+                                    <TL>Disk</TL>
+                                </label>
+                                <div class="input-group mb-5">
+                                    <span class="input-group-text">
+                                        <i class="bx bx-hdd"></i>
+                                    </span>
+                                    <InputNumber @bind-Value="Model.Disk" class="form-control"></InputNumber>
+                                    <span class="input-group-text">
+                                        MB
+                                    </span>
+                                </div>
+                                <label class="form-label">
+                                    <TL>Node</TL>
+                                </label>
+                                <div class="input-group mb-5">
+                                    <SmartSelect @bind-Value="Model.Node"
+                                                 Items="Nodes"
+                                                 DisplayField="@(x => x.Name)">
+                                    </SmartSelect>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row mb-5">
+                            <div class="card card-body p-10">
+                                <label class="form-label">
+                                    <TL>Image</TL>
+                                </label>
+                                <div class="mb-5">
+                                    <SmartSelect TField="Image" @bind-Value="Model.Image" Items="Images" DisplayField="@(x => x.Name)" OnChange="OnChange"></SmartSelect>
+                                </div>
+                                @if (Model.Image != null)
+                                {
+                                    <label class="form-label">
+                                        <TL>Override startup</TL>
+                                    </label>
+                                    <div class="input-group mb-5">
+                                        <span class="input-group-text">
+                                            <i class="bx bx-terminal"></i>
+                                        </span>
+                                        <InputText @bind-Value="Model.OverrideStartup" type="text" class="form-control" placeholder="@(Model.Image.Startup)"></InputText>
+                                    </div>
+                                    <label class="form-label">
+                                        <TL>Docker image</TL>
+                                    </label>
+                                    <InputSelect TValue="int" @bind-Value="Model.DockerImageIndex" class="form-control">
+                                        @foreach (var image in Model.Image.DockerImages)
+                                        {
+                                            <option value="@(Model.Image.DockerImages.IndexOf(image))">@(image.Name)</option>
+                                        }
+                                    </InputSelect>
+                                }
+                            </div>
+                        </div>
+            
+                        <div class="row mb-5">
+                            <div class="card card-body">
+                                @if (Model.Image != null)
+                                {
+                                    <div class="mt-9 row d-flex">
+                                        @foreach (var vars in ServerVariables.Chunk(3))
+                                        {
+                                            <div class="row row-cols-3 mb-3">
+                                                @foreach (var variable in vars)
+                                                {
+                                                    <div class="col">
+                                                        <div class="card card-body border">
+                                                            <label class="form-label">
+                                                                <TL>Name</TL>
+                                                            </label>
+                                                            <div class="input-group mb-5">
+                                                                <input @bind="variable.Key" type="text" class="form-control disabled" disabled="">
+                                                            </div>
+                                                            <label class="form-label">
+                                                                <TL>Value</TL>
+                                                            </label>
+                                                            <div class="input-group mb-5">
+                                                                <input @bind="variable.Value" type="text" class="form-control">
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                }
+                                            </div>
+                                        }
+                                    </div>
+                                }
+                            </div>
+                        </div>
+            
+                        <div class="row">
+                            <div class="card card-body">
+                                <div class="d-flex justify-content-end">
+                                    <a href="/admin/servers" class="btn btn-danger me-3">
+                                        <TL>Cancel</TL>
+                                    </a>
+                                    <button class="btn btn-success" type="submit">
+                                        <TL>Create</TL>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </SmartForm>
+                </LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Statistics.razor b/Moonlight/Shared/Views/Admin/Statistics.razor
index 14481fba..8441a22a 100644
--- a/Moonlight/Shared/Views/Admin/Statistics.razor
+++ b/Moonlight/Shared/Views/Admin/Statistics.razor
@@ -10,78 +10,78 @@
 @inject StatisticsViewService StatisticsViewService
 @inject SmartTranslateService SmartTranslateService
 
-<OnlyAdmin>
-    <div class="row mt-4 mb-2">
-        <div class="col-12 col-lg-6 col-xl">
-            <div class="card card-body">
-                <select class="form-select" @bind="TimeSpanBind">
-                    <option value="1">
-                        <TL>Hour</TL>
-                    </option>
-                    <option value="24">
-                        <TL>Day</TL>
-                    </option>
-                    <option value="744">
-                        <TL>Month</TL>
-                    </option>
-                    <option value="8760">
-                        <TL>Year</TL>
-                    </option>
-                    <option value="867240">
-                        <TL>All time</TL>
-                    </option>
-                </select>
-            </div>
+@attribute [PermissionRequired(nameof(Permissions.AdminStatistics))]
+
+<div class="row mt-4 mb-2">
+    <div class="col-12 col-lg-6 col-xl">
+        <div class="card card-body">
+            <select class="form-select" @bind="TimeSpanBind">
+                <option value="1">
+                    <TL>Hour</TL>
+                </option>
+                <option value="24">
+                    <TL>Day</TL>
+                </option>
+                <option value="744">
+                    <TL>Month</TL>
+                </option>
+                <option value="8760">
+                    <TL>Year</TL>
+                </option>
+                <option value="867240">
+                    <TL>All time</TL>
+                </option>
+            </select>
         </div>
     </div>
+</div>
 
-    <LazyLoader @ref="Loader" Load="Load">
-        @foreach (var charts in Charts.Chunk(2))
-        {
-            <div class="row">
-                @foreach (var chart in charts)
-                {
-                    <div class="col-sm-6">
-                        <div class="card mt-4">
-                            <div class="card-header">
-                                <div class="card-title">
-                                    <TL>@chart.Key</TL>
-                                </div>
-                            </div>
-                            <div class="card-body">
-                                <ApexChart TItem="StatisticsData"
-                                           Options="GenerateOptions()"
-                                           OnRendered="OnChartRendered">
-                                    <ApexPointSeries TItem="StatisticsData"
-                                                     Items="chart.Value"
-                                                     SeriesType="SeriesType.Area"
-                                                     Name=""
-                                                     ShowDataLabels="false"
-                                                     XValue="@(e => Formatter.FormatDate(e.Date))"
-                                                     YValue="@(e => (decimal)Math.Round(e.Value))"/>
-                                </ApexChart>
-                            </div>
-                        </div>
-                    </div>
-                }
-            </div>
-        }
+<LazyLoader @ref="Loader" Load="Load">
+    @foreach (var charts in Charts.Chunk(2))
+    {
         <div class="row">
-            <div class="col-sm-6">
-                <div class="card mt-4">
-                    <div class="card-header">
-                        <div class="card-title">
-                            <TL>Active users</TL>
+            @foreach (var chart in charts)
+            {
+                <div class="col-sm-6">
+                    <div class="card mt-4">
+                        <div class="card-header">
+                            <div class="card-title">
+                                <TL>@chart.Key</TL>
+                            </div>
+                        </div>
+                        <div class="card-body">
+                            <ApexChart TItem="StatisticsData"
+                                       Options="GenerateOptions()"
+                                       OnRendered="OnChartRendered">
+                                <ApexPointSeries TItem="StatisticsData"
+                                                 Items="chart.Value"
+                                                 SeriesType="SeriesType.Area"
+                                                 Name=""
+                                                 ShowDataLabels="false"
+                                                 XValue="@(e => Formatter.FormatDate(e.Date))"
+                                                 YValue="@(e => (decimal)Math.Round(e.Value))"/>
+                            </ApexChart>
                         </div>
                     </div>
-                    <div class="card-body">
-                        <span class="fs-2">@(ActiveUsers)</span>
+                </div>
+            }
+        </div>
+    }
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="card mt-4">
+                <div class="card-header">
+                    <div class="card-title">
+                        <TL>Active users</TL>
                     </div>
                 </div>
+                <div class="card-body">
+                    <span class="fs-2">@(ActiveUsers)</span>
+                </div>
             </div>
         </div>
-    </LazyLoader>
-</OnlyAdmin>
+    </div>
+</LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Subscriptions/Edit.razor b/Moonlight/Shared/Views/Admin/Subscriptions/Edit.razor
index 40dfe36e..485df0cd 100644
--- a/Moonlight/Shared/Views/Admin/Subscriptions/Edit.razor
+++ b/Moonlight/Shared/Views/Admin/Subscriptions/Edit.razor
@@ -10,155 +10,155 @@
 @inject SubscriptionRepository SubscriptionRepository
 @inject SubscriptionService SubscriptionService
 
-<OnlyAdmin>
-    <div class="card card-body p-10">
-        <LazyLoader Load="Load">
-            @if (Subscription == null)
-            {
-                <div class="alert alert-danger">
-                    No subscription with this id has been found
-                </div>
-            }
-            else
-            {
-                <SmartForm Model="Model" OnValidSubmit="OnSubmit">
-                    <label class="form-label">
-                        <TL>Name</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <InputText @bind-Value="Model.Name" class="form-control"></InputText>
-                    </div>
-                    <label class="form-label">
-                        <TL>Description</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <InputTextArea @bind-Value="Model.Description" class="form-control"></InputTextArea>
-                    </div>
-                    <label class="form-label">
-                        <TL>Price</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <InputNumber @bind-Value="Model.Price" class="form-control"></InputNumber>
-                    </div>
-                    <label class="form-label">
-                        <TL>Currency</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <select @bind="Model.Currency" class="form-select">
-                            @foreach (var currency in (Currency[])Enum.GetValues(typeof(Currency)))
-                            {
-                                if (Model.Currency == currency)
-                                {
-                                    <option value="@(currency)" selected="">@(currency)</option>
-                                }
-                                else
-                                {
-                                    <option value="@(currency)">@(currency)</option>
-                                }
-                            }
-                        </select>
-                    </div>
-                    <label class="form-label">
-                        <TL>Duration</TL>
-                    </label>
-                    <div class="input-group mb-5">
-                        <InputNumber @bind-Value="Model.Duration" class="form-control"></InputNumber>
-                    </div>
+@attribute [PermissionRequired(nameof(Permissions.AdminSubscriptionEdit))]
 
-                    <div>
-                        @foreach (var limitPart in Limits.Chunk(3))
+<div class="card card-body p-10">
+    <LazyLoader Load="Load">
+        @if (Subscription == null)
+        {
+            <div class="alert alert-danger">
+                No subscription with this id has been found
+            </div>
+        }
+        else
+        {
+            <SmartForm Model="Model" OnValidSubmit="OnSubmit">
+                <label class="form-label">
+                    <TL>Name</TL>
+                </label>
+                <div class="input-group mb-5">
+                    <InputText @bind-Value="Model.Name" class="form-control"></InputText>
+                </div>
+                <label class="form-label">
+                    <TL>Description</TL>
+                </label>
+                <div class="input-group mb-5">
+                    <InputTextArea @bind-Value="Model.Description" class="form-control"></InputTextArea>
+                </div>
+                <label class="form-label">
+                    <TL>Price</TL>
+                </label>
+                <div class="input-group mb-5">
+                    <InputNumber @bind-Value="Model.Price" class="form-control"></InputNumber>
+                </div>
+                <label class="form-label">
+                    <TL>Currency</TL>
+                </label>
+                <div class="input-group mb-5">
+                    <select @bind="Model.Currency" class="form-select">
+                        @foreach (var currency in (Currency[])Enum.GetValues(typeof(Currency)))
                         {
-                            <div class="row row-cols-3 mb-5">
-                                @foreach (var limit in limitPart)
-                                {
-                                    <div class="col">
-                                        <div class="card card-body border">
-                                            <label class="form-label">
-                                                <TL>Identifier</TL>
-                                            </label>
-                                            <div class="input-group mb-5">
-                                                <input @bind="limit.Identifier" type="text" class="form-control">
+                            if (Model.Currency == currency)
+                            {
+                                <option value="@(currency)" selected="">@(currency)</option>
+                            }
+                            else
+                            {
+                                <option value="@(currency)">@(currency)</option>
+                            }
+                        }
+                    </select>
+                </div>
+                <label class="form-label">
+                    <TL>Duration</TL>
+                </label>
+                <div class="input-group mb-5">
+                    <InputNumber @bind-Value="Model.Duration" class="form-control"></InputNumber>
+                </div>
+
+                <div>
+                    @foreach (var limitPart in Limits.Chunk(3))
+                    {
+                        <div class="row row-cols-3 mb-5">
+                            @foreach (var limit in limitPart)
+                            {
+                                <div class="col">
+                                    <div class="card card-body border">
+                                        <label class="form-label">
+                                            <TL>Identifier</TL>
+                                        </label>
+                                        <div class="input-group mb-5">
+                                            <input @bind="limit.Identifier" type="text" class="form-control">
+                                        </div>
+                                        <label class="form-label">
+                                            <TL>Amount</TL>
+                                        </label>
+                                        <div class="input-group mb-5">
+                                            <input @bind="limit.Amount" type="number" class="form-control">
+                                        </div>
+                                        <div class="d-flex flex-column mb-15 fv-row">
+                                            <div class="fs-5 fw-bold form-label mb-3">
+                                                <TL>Options</TL>
                                             </div>
-                                            <label class="form-label">
-                                                <TL>Amount</TL>
-                                            </label>
-                                            <div class="input-group mb-5">
-                                                <input @bind="limit.Amount" type="number" class="form-control">
-                                            </div>
-                                            <div class="d-flex flex-column mb-15 fv-row">
-                                                <div class="fs-5 fw-bold form-label mb-3">
-                                                    <TL>Options</TL>
-                                                </div>
-                                                <div class="table-responsive">
-                                                    <div class="dataTables_wrapper dt-bootstrap4 no-footer">
-                                                        <div class="table-responsive">
-                                                            <table class="table align-middle table-row-dashed fw-semibold fs-6 gy-5 dataTable no-footer">
-                                                                <thead>
-                                                                <tr class="text-start text-muted fw-bold fs-7 text-uppercase gs-0">
-                                                                    <th class="pt-0 sorting_disabled">
-                                                                        <TL>Key</TL>
-                                                                    </th>
-                                                                    <th class="pt-0 sorting_disabled">
-                                                                        <TL>Value</TL>
-                                                                    </th>
-                                                                    <th class="pt-0 text-end sorting_disabled">
-                                                                        <TL>Remove</TL>
-                                                                    </th>
+                                            <div class="table-responsive">
+                                                <div class="dataTables_wrapper dt-bootstrap4 no-footer">
+                                                    <div class="table-responsive">
+                                                        <table class="table align-middle table-row-dashed fw-semibold fs-6 gy-5 dataTable no-footer">
+                                                            <thead>
+                                                            <tr class="text-start text-muted fw-bold fs-7 text-uppercase gs-0">
+                                                                <th class="pt-0 sorting_disabled">
+                                                                    <TL>Key</TL>
+                                                                </th>
+                                                                <th class="pt-0 sorting_disabled">
+                                                                    <TL>Value</TL>
+                                                                </th>
+                                                                <th class="pt-0 text-end sorting_disabled">
+                                                                    <TL>Remove</TL>
+                                                                </th>
+                                                            </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                            @foreach (var option in limit.Options)
+                                                            {
+                                                                <tr class="odd">
+                                                                    <td>
+                                                                        <input @bind="option.Key" type="text" class="form-control form-control-solid">
+                                                                    </td>
+                                                                    <td>
+                                                                        <input @bind="option.Value" type="text" class="form-control form-control-solid">
+                                                                    </td>
+                                                                    <td class="text-end">
+                                                                        <button @onclick="() => limit.Options.Remove(option)" type="button" class="btn btn-icon btn-flex btn-active-light-primary w-30px h-30px me-3" data-kt-action="field_remove">
+                                                                            <i class="bx bx-trash"></i>
+                                                                        </button>
+                                                                    </td>
                                                                 </tr>
-                                                                </thead>
-                                                                <tbody>
-                                                                @foreach (var option in limit.Options)
-                                                                {
-                                                                    <tr class="odd">
-                                                                        <td>
-                                                                            <input @bind="option.Key" type="text" class="form-control form-control-solid">
-                                                                        </td>
-                                                                        <td>
-                                                                            <input @bind="option.Value" type="text" class="form-control form-control-solid">
-                                                                        </td>
-                                                                        <td class="text-end">
-                                                                            <button @onclick="() => limit.Options.Remove(option)" type="button" class="btn btn-icon btn-flex btn-active-light-primary w-30px h-30px me-3" data-kt-action="field_remove">
-                                                                                <i class="bx bx-trash"></i>
-                                                                            </button>
-                                                                        </td>
-                                                                    </tr>
-                                                                }
-                                                                </tbody>
-                                                            </table>
-                                                        </div>
-                                                        <div class="row">
-                                                            <div class="col-sm-12 col-md-5 d-flex align-items-center justify-content-center justify-content-md-start"></div>
-                                                            <div class="col-sm-12 col-md-7 d-flex align-items-center justify-content-center justify-content-md-end"></div>
-                                                        </div>
+                                                            }
+                                                            </tbody>
+                                                        </table>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col-sm-12 col-md-5 d-flex align-items-center justify-content-center justify-content-md-start"></div>
+                                                        <div class="col-sm-12 col-md-7 d-flex align-items-center justify-content-center justify-content-md-end"></div>
                                                     </div>
                                                 </div>
-                                                <div class="btn-group mt-5">
-                                                    <button @onclick:preventDefault @onclick="() => limit.Options.Add(new())" type="button" class="btn btn-light-primary me-auto">Add option</button>
-                                                    <button @onclick:preventDefault @onclick="() => Limits.Remove(limit)" class="btn btn-danger float-end">
-                                                        <i class="bx bx-trash"></i>
-                                                    </button>
-                                                </div>
+                                            </div>
+                                            <div class="btn-group mt-5">
+                                                <button @onclick:preventDefault @onclick="() => limit.Options.Add(new())" type="button" class="btn btn-light-primary me-auto">Add option</button>
+                                                <button @onclick:preventDefault @onclick="() => Limits.Remove(limit)" class="btn btn-danger float-end">
+                                                    <i class="bx bx-trash"></i>
+                                                </button>
                                             </div>
                                         </div>
                                     </div>
-                                }
-                            </div>
-                        }
-                    </div>
+                                </div>
+                            }
+                        </div>
+                    }
+                </div>
 
-                    <div class="float-end">
-                        <button @onclick:preventDefault @onclick="() => Limits.Add(new())" class="btn btn-primary">
-                            <TL>Add new limit</TL>
-                        </button>
-                        <button type="submit" class="btn btn-success">
-                            <TL>Save subscription</TL>
-                        </button>
-                    </div>
-                </SmartForm>
-            }
-        </LazyLoader>
-    </div>
-</OnlyAdmin>
+                <div class="float-end">
+                    <button @onclick:preventDefault @onclick="() => Limits.Add(new())" class="btn btn-primary">
+                        <TL>Add new limit</TL>
+                    </button>
+                    <button type="submit" class="btn btn-success">
+                        <TL>Save subscription</TL>
+                    </button>
+                </div>
+            </SmartForm>
+        }
+    </LazyLoader>
+</div>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Subscriptions/Index.razor b/Moonlight/Shared/Views/Admin/Subscriptions/Index.razor
index f15b2def..184bfa0c 100644
--- a/Moonlight/Shared/Views/Admin/Subscriptions/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Subscriptions/Index.razor
@@ -9,52 +9,52 @@
 @inject SubscriptionRepository SubscriptionRepository
 @inject SubscriptionService SubscriptionService
 
-<OnlyAdmin>
-    <div class="card">
-        <LazyLoader @ref="LazyLoader" Load="Load">
-            <div class="card-header border-0 pt-5">
-                <h3 class="card-title align-items-start flex-column">
-                    <span class="card-label fw-bold fs-3 mb-1">
-                        <TL>Subscriptions</TL>
-                    </span>
-                </h3>
-                <div class="card-toolbar">
-                    <a href="/admin/subscriptions/new" class="btn btn-sm btn-light-success">
-                        <i class="bx bx-credit-card"></i>
-                        <TL>New subscription</TL>
-                    </a>
-                </div>
-            </div>
-            <div class="card-body">
-                <div class="table-responsive">
-                    <Table TableItem="Subscription" Items="Subscriptions" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                        <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Description"))" Field="@(x => x.Description)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Price"))" Field="@(x => x.Price)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Currency"))" Field="@(x => x.Currency)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Duration"))" Field="@(x => x.Duration)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="Subscription" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                            <Template>
-                                <a href="/admin/subscriptions/edit/@(context.Id)/">
-                                    <TL>Manage</TL>
+@attribute [PermissionRequired(nameof(Permissions.AdminSubscriptions))]
+
+<div class="card">
+                    <LazyLoader @ref="LazyLoader" Load="Load">
+                        <div class="card-header border-0 pt-5">
+                            <h3 class="card-title align-items-start flex-column">
+                                <span class="card-label fw-bold fs-3 mb-1">
+                                    <TL>Subscriptions</TL>
+                                </span>
+                            </h3>
+                            <div class="card-toolbar">
+                                <a href="/admin/subscriptions/new" class="btn btn-sm btn-light-success">
+                                    <i class="bx bx-credit-card"></i>
+                                    <TL>New subscription</TL>
                                 </a>
-                            </Template>
-                        </Column>
-                        <Column TableItem="Subscription" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                            <Template>
-                                <DeleteButton Confirm="true"
-                                              OnClick="() => Delete(context)">
-                                </DeleteButton>
-                            </Template>
-                        </Column>
-                        <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                    </Table>
+                            </div>
+                        </div>
+                        <div class="card-body">
+                            <div class="table-responsive">
+                                <Table TableItem="Subscription" Items="Subscriptions" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                                    <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
+                                    <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true"/>
+                                    <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Description"))" Field="@(x => x.Description)" Sortable="true" Filterable="true"/>
+                                    <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Price"))" Field="@(x => x.Price)" Sortable="true" Filterable="true"/>
+                                    <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Currency"))" Field="@(x => x.Currency)" Sortable="true" Filterable="true"/>
+                                    <Column TableItem="Subscription" Title="@(SmartTranslateService.Translate("Duration"))" Field="@(x => x.Duration)" Sortable="true" Filterable="true"/>
+                                    <Column TableItem="Subscription" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                                        <Template>
+                                            <a href="/admin/subscriptions/edit/@(context.Id)/">
+                                                <TL>Manage</TL>
+                                            </a>
+                                        </Template>
+                                    </Column>
+                                    <Column TableItem="Subscription" Title="" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                                        <Template>
+                                            <DeleteButton Confirm="true"
+                                                          OnClick="() => Delete(context)">
+                                            </DeleteButton>
+                                        </Template>
+                                    </Column>
+                                    <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                                </Table>
+                            </div>
+                        </div>
+                    </LazyLoader>
                 </div>
-            </div>
-        </LazyLoader>
-    </div>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Subscriptions/New.razor b/Moonlight/Shared/Views/Admin/Subscriptions/New.razor
index 5deb8766..e5b078ab 100644
--- a/Moonlight/Shared/Views/Admin/Subscriptions/New.razor
+++ b/Moonlight/Shared/Views/Admin/Subscriptions/New.razor
@@ -8,144 +8,144 @@
 @inject SubscriptionRepository SubscriptionRepository
 @inject SubscriptionService SubscriptionService
 
-<OnlyAdmin>
-    <div class="card card-body p-10">
-        <SmartForm Model="Model" OnValidSubmit="OnSubmit">
-            <label class="form-label">
-                <TL>Name</TL>
-            </label>
-            <div class="input-group mb-5">
-                <InputText @bind-Value="Model.Name" class="form-control"></InputText>
-            </div>
-            <label class="form-label">
-                <TL>Description</TL>
-            </label>
-            <div class="input-group mb-5">
-                <InputTextArea @bind-Value="Model.Description" class="form-control"></InputTextArea>
-            </div>
-            <label class="form-label">
-                <TL>Price</TL>
-            </label>
-            <div class="input-group mb-5">
-                <InputNumber @bind-Value="Model.Price" class="form-control"></InputNumber>
-            </div>
-            <label class="form-label">
-                <TL>Currency</TL>
-            </label>
-            <div class="input-group mb-5">
-                <select @bind="Model.Currency" class="form-select">
-                    @foreach (var currency in (Currency[])Enum.GetValues(typeof(Currency)))
-                    {
-                        if (Model.Currency == currency)
-                        {
-                            <option value="@(currency)" selected="">@(currency)</option>
-                        }
-                        else
-                        {
-                            <option value="@(currency)">@(currency)</option>
-                        }
-                    }
-                </select>
-            </div>
-            <label class="form-label">
-                <TL>Duration</TL>
-            </label>
-            <div class="input-group mb-5">
-                <InputNumber @bind-Value="Model.Duration" class="form-control"></InputNumber>
-            </div>
+@attribute [PermissionRequired(nameof(Permissions.AdminNewSubscription))]
 
-            <div>
-                @foreach (var limitPart in Limits.Chunk(3))
-                {
-                    <div class="row row-cols-3 mb-5">
-                        @foreach (var limit in limitPart)
-                        {
-                            <div class="col">
-                                <div class="card card-body border">
-                                    <label class="form-label">
-                                        <TL>Identifier</TL>
-                                    </label>
-                                    <div class="input-group mb-5">
-                                        <input @bind="limit.Identifier" type="text" class="form-control">
-                                    </div>
-                                    <label class="form-label">
-                                        <TL>Amount</TL>
-                                    </label>
-                                    <div class="input-group mb-5">
-                                        <input @bind="limit.Amount" type="number" class="form-control">
-                                    </div>
-                                    <div class="d-flex flex-column mb-15 fv-row">
-                                        <div class="fs-5 fw-bold form-label mb-3">
-                                            <TL>Options</TL>
-                                        </div>
-                                        <div class="table-responsive">
-                                            <div class="dataTables_wrapper dt-bootstrap4 no-footer">
-                                                <div class="table-responsive">
-                                                    <table class="table align-middle table-row-dashed fw-semibold fs-6 gy-5 dataTable no-footer">
-                                                        <thead>
-                                                        <tr class="text-start text-muted fw-bold fs-7 text-uppercase gs-0">
-                                                            <th class="pt-0 sorting_disabled">
-                                                                <TL>Key</TL>
-                                                            </th>
-                                                            <th class="pt-0 sorting_disabled">
-                                                                <TL>Value</TL>
-                                                            </th>
-                                                            <th class="pt-0 text-end sorting_disabled">
-                                                                <TL>Remove</TL>
-                                                            </th>
-                                                        </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                        @foreach (var option in limit.Options)
-                                                        {
-                                                            <tr class="odd">
-                                                                <td>
-                                                                    <input @bind="option.Key" type="text" class="form-control form-control-solid">
-                                                                </td>
-                                                                <td>
-                                                                    <input @bind="option.Value" type="text" class="form-control form-control-solid">
-                                                                </td>
-                                                                <td class="text-end">
-                                                                    <button @onclick="() => limit.Options.Remove(option)" type="button" class="btn btn-icon btn-flex btn-active-light-primary w-30px h-30px me-3" data-kt-action="field_remove">
-                                                                        <i class="bx bx-trash"></i>
-                                                                    </button>
-                                                                </td>
-                                                            </tr>
-                                                        }
-                                                        </tbody>
-                                                    </table>
+<div class="card card-body p-10">
+                    <SmartForm Model="Model" OnValidSubmit="OnSubmit">
+                        <label class="form-label">
+                            <TL>Name</TL>
+                        </label>
+                        <div class="input-group mb-5">
+                            <InputText @bind-Value="Model.Name" class="form-control"></InputText>
+                        </div>
+                        <label class="form-label">
+                            <TL>Description</TL>
+                        </label>
+                        <div class="input-group mb-5">
+                            <InputTextArea @bind-Value="Model.Description" class="form-control"></InputTextArea>
+                        </div>
+                        <label class="form-label">
+                            <TL>Price</TL>
+                        </label>
+                        <div class="input-group mb-5">
+                            <InputNumber @bind-Value="Model.Price" class="form-control"></InputNumber>
+                        </div>
+                        <label class="form-label">
+                            <TL>Currency</TL>
+                        </label>
+                        <div class="input-group mb-5">
+                            <select @bind="Model.Currency" class="form-select">
+                                @foreach (var currency in (Currency[])Enum.GetValues(typeof(Currency)))
+                                {
+                                    if (Model.Currency == currency)
+                                    {
+                                        <option value="@(currency)" selected="">@(currency)</option>
+                                    }
+                                    else
+                                    {
+                                        <option value="@(currency)">@(currency)</option>
+                                    }
+                                }
+                            </select>
+                        </div>
+                        <label class="form-label">
+                            <TL>Duration</TL>
+                        </label>
+                        <div class="input-group mb-5">
+                            <InputNumber @bind-Value="Model.Duration" class="form-control"></InputNumber>
+                        </div>
+            
+                        <div>
+                            @foreach (var limitPart in Limits.Chunk(3))
+                            {
+                                <div class="row row-cols-3 mb-5">
+                                    @foreach (var limit in limitPart)
+                                    {
+                                        <div class="col">
+                                            <div class="card card-body border">
+                                                <label class="form-label">
+                                                    <TL>Identifier</TL>
+                                                </label>
+                                                <div class="input-group mb-5">
+                                                    <input @bind="limit.Identifier" type="text" class="form-control">
                                                 </div>
-                                                <div class="row">
-                                                    <div class="col-sm-12 col-md-5 d-flex align-items-center justify-content-center justify-content-md-start"></div>
-                                                    <div class="col-sm-12 col-md-7 d-flex align-items-center justify-content-center justify-content-md-end"></div>
+                                                <label class="form-label">
+                                                    <TL>Amount</TL>
+                                                </label>
+                                                <div class="input-group mb-5">
+                                                    <input @bind="limit.Amount" type="number" class="form-control">
+                                                </div>
+                                                <div class="d-flex flex-column mb-15 fv-row">
+                                                    <div class="fs-5 fw-bold form-label mb-3">
+                                                        <TL>Options</TL>
+                                                    </div>
+                                                    <div class="table-responsive">
+                                                        <div class="dataTables_wrapper dt-bootstrap4 no-footer">
+                                                            <div class="table-responsive">
+                                                                <table class="table align-middle table-row-dashed fw-semibold fs-6 gy-5 dataTable no-footer">
+                                                                    <thead>
+                                                                    <tr class="text-start text-muted fw-bold fs-7 text-uppercase gs-0">
+                                                                        <th class="pt-0 sorting_disabled">
+                                                                            <TL>Key</TL>
+                                                                        </th>
+                                                                        <th class="pt-0 sorting_disabled">
+                                                                            <TL>Value</TL>
+                                                                        </th>
+                                                                        <th class="pt-0 text-end sorting_disabled">
+                                                                            <TL>Remove</TL>
+                                                                        </th>
+                                                                    </tr>
+                                                                    </thead>
+                                                                    <tbody>
+                                                                    @foreach (var option in limit.Options)
+                                                                    {
+                                                                        <tr class="odd">
+                                                                            <td>
+                                                                                <input @bind="option.Key" type="text" class="form-control form-control-solid">
+                                                                            </td>
+                                                                            <td>
+                                                                                <input @bind="option.Value" type="text" class="form-control form-control-solid">
+                                                                            </td>
+                                                                            <td class="text-end">
+                                                                                <button @onclick="() => limit.Options.Remove(option)" type="button" class="btn btn-icon btn-flex btn-active-light-primary w-30px h-30px me-3" data-kt-action="field_remove">
+                                                                                    <i class="bx bx-trash"></i>
+                                                                                </button>
+                                                                            </td>
+                                                                        </tr>
+                                                                    }
+                                                                    </tbody>
+                                                                </table>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col-sm-12 col-md-5 d-flex align-items-center justify-content-center justify-content-md-start"></div>
+                                                                <div class="col-sm-12 col-md-7 d-flex align-items-center justify-content-center justify-content-md-end"></div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="btn-group mt-5">
+                                                        <button @onclick:preventDefault @onclick="() => limit.Options.Add(new())" type="button" class="btn btn-light-primary me-auto">Add option</button>
+                                                        <button @onclick:preventDefault @onclick="() => Limits.Remove(limit)" class="btn btn-danger float-end">
+                                                            <i class="bx bx-trash"></i>
+                                                        </button>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="btn-group mt-5">
-                                            <button @onclick:preventDefault @onclick="() => limit.Options.Add(new())" type="button" class="btn btn-light-primary me-auto">Add option</button>
-                                            <button @onclick:preventDefault @onclick="() => Limits.Remove(limit)" class="btn btn-danger float-end">
-                                                <i class="bx bx-trash"></i>
-                                            </button>
-                                        </div>
-                                    </div>
+                                    }
                                 </div>
-                            </div>
-                        }
-                    </div>
-                }
-            </div>
-
-            <div class="float-end">
-                <button @onclick:preventDefault @onclick="() => Limits.Add(new())" class="btn btn-primary">
-                    <TL>Add new limit</TL>
-                </button>
-                <button type="submit" class="btn btn-success">
-                    <TL>Create subscription</TL>
-                </button>
-            </div>
-        </SmartForm>
-    </div>
-</OnlyAdmin>
+                            }
+                        </div>
+            
+                        <div class="float-end">
+                            <button @onclick:preventDefault @onclick="() => Limits.Add(new())" class="btn btn-primary">
+                                <TL>Add new limit</TL>
+                            </button>
+                            <button type="submit" class="btn btn-success">
+                                <TL>Create subscription</TL>
+                            </button>
+                        </div>
+                    </SmartForm>
+                </div>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Support/Index.razor b/Moonlight/Shared/Views/Admin/Support/Index.razor
index ede64b7d..ca27d4d5 100644
--- a/Moonlight/Shared/Views/Admin/Support/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Support/Index.razor
@@ -8,8 +8,9 @@
 
 @implements IDisposable
 
-<OnlyAdmin>
-    <LazyLoader @ref="LazyLoader" Load="Load">
+@attribute [PermissionRequired(nameof(Permissions.AdminSupport))]
+
+<LazyLoader @ref="LazyLoader" Load="Load">
         <div class="card">
             <div class="card-body">
                 <div class="d-flex flex-column flex-xl-row p-5 pb-0">
@@ -70,7 +71,6 @@
             </div>
         </div>
     </LazyLoader>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Support/View.razor b/Moonlight/Shared/Views/Admin/Support/View.razor
index 58dc3b1b..5b28d7fc 100644
--- a/Moonlight/Shared/Views/Admin/Support/View.razor
+++ b/Moonlight/Shared/Views/Admin/Support/View.razor
@@ -14,213 +14,213 @@
 
 @implements IDisposable
 
-<OnlyAdmin>
-    <LazyLoader Load="Load">
-        @if (User == null)
-        {
-            <div class="alert alert-danger">
-                <TL>User not found</TL>
-            </div>
-        }
-        else
-        {
-            <div class="row">
-                <div class="d-flex flex-column flex-xl-row p-7">
-                    <div class="flex-lg-row-fluid me-6 mb-20 mb-xl-0">
-                        <div class="card">
-                            <div class="card-body">
-                                <LazyLoader Load="LoadMessages">
-                                    <div class="scroll-y me-n5 pe-5" style="max-height: 55vh; display: flex; flex-direction: column-reverse;">
-                                        @foreach (var message in Messages)
-                                        {
-                                            if (message.Sender == null || message.Sender.Id != User.Id)
-                                            {
-                                                <div class="d-flex justify-content-end mb-10 ">
-                                                    <div class="d-flex flex-column align-items-end">
-                                                        <div class="d-flex align-items-center mb-2">
-                                                            <div class="me-3">
-                                                                <span class="text-muted fs-7 mb-1">@(Formatter.FormatAgoFromDateTime(message.CreatedAt, SmartTranslateService))</span>
-                                                                <a class="fs-5 fw-bold text-gray-900 text-hover-primary ms-1">
-                                                                    @if (message.Sender != null)
-                                                                    {
-                                                                        <span>@(message.Sender.FirstName) @(message.Sender.LastName)</span>
-                                                                    }
-                                                                    else
-                                                                    {
-                                                                        <span>
-                                                                            <TL>System</TL>
-                                                                        </span>
-                                                                    }
-                                                                </a>
-                                                            </div>
-                                                            <div class="symbol symbol-35px symbol-circle ">
-                                                                <img alt="Logo" src="@(ResourceService.Image("logo.svg"))">
-                                                            </div>
-                                                        </div>
+@attribute [PermissionRequired(nameof(Permissions.AdminSupportView))]
 
-                                                        <div class="p-5 rounded bg-light-primary text-dark fw-semibold mw-lg-400px text-end">
-                                                            @if (message.Sender == null)
-                                                            {
-                                                                <TL>@(message.Content)</TL>
-                                                            }
-                                                            else
-                                                            {
-                                                                foreach (var line in message.Content.Split("\n"))
-                                                                {
-                                                                    @(line)<br/>
-                                                                }
-
-                                                                if (message.Attachment != "")
-                                                                {
-                                                                    <div class="mt-3">
-                                                                        @if (Regex.IsMatch(message.Attachment, @"\.(jpg|jpeg|png|gif|bmp)$"))
+<LazyLoader Load="Load">
+                    @if (User == null)
+                    {
+                        <div class="alert alert-danger">
+                            <TL>User not found</TL>
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="row">
+                            <div class="d-flex flex-column flex-xl-row p-7">
+                                <div class="flex-lg-row-fluid me-6 mb-20 mb-xl-0">
+                                    <div class="card">
+                                        <div class="card-body">
+                                            <LazyLoader Load="LoadMessages">
+                                                <div class="scroll-y me-n5 pe-5" style="max-height: 55vh; display: flex; flex-direction: column-reverse;">
+                                                    @foreach (var message in Messages)
+                                                    {
+                                                        if (message.Sender == null || message.Sender.Id != User.Id)
+                                                        {
+                                                            <div class="d-flex justify-content-end mb-10 ">
+                                                                <div class="d-flex flex-column align-items-end">
+                                                                    <div class="d-flex align-items-center mb-2">
+                                                                        <div class="me-3">
+                                                                            <span class="text-muted fs-7 mb-1">@(Formatter.FormatAgoFromDateTime(message.CreatedAt, SmartTranslateService))</span>
+                                                                            <a class="fs-5 fw-bold text-gray-900 text-hover-primary ms-1">
+                                                                                @if (message.Sender != null)
+                                                                                {
+                                                                                    <span>@(message.Sender.FirstName) @(message.Sender.LastName)</span>
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                    <span>
+                                                                                        <TL>System</TL>
+                                                                                    </span>
+                                                                                }
+                                                                            </a>
+                                                                        </div>
+                                                                        <div class="symbol symbol-35px symbol-circle ">
+                                                                            <img alt="Logo" src="@(ResourceService.Image("logo.svg"))">
+                                                                        </div>
+                                                                    </div>
+            
+                                                                    <div class="p-5 rounded bg-light-primary text-dark fw-semibold mw-lg-400px text-end">
+                                                                        @if (message.Sender == null)
                                                                         {
-                                                                            <img src="@(ResourceService.BucketItem("supportChat", message.Attachment))" class="img-fluid" alt="Attachment"/>
+                                                                            <TL>@(message.Content)</TL>
                                                                         }
                                                                         else
                                                                         {
-                                                                            <a class="btn btn-secondary" href="@(ResourceService.BucketItem("supportChat", message.Attachment))">
-                                                                                <i class="me-2 bx bx-download"></i> @(message.Attachment)
-                                                                            </a>
+                                                                            foreach (var line in message.Content.Split("\n"))
+                                                                            {
+                                                                                @(line)<br/>
+                                                                            }
+            
+                                                                            if (message.Attachment != "")
+                                                                            {
+                                                                                <div class="mt-3">
+                                                                                    @if (Regex.IsMatch(message.Attachment, @"\.(jpg|jpeg|png|gif|bmp)$"))
+                                                                                    {
+                                                                                        <img src="@(ResourceService.BucketItem("supportChat", message.Attachment))" class="img-fluid" alt="Attachment"/>
+                                                                                    }
+                                                                                    else
+                                                                                    {
+                                                                                        <a class="btn btn-secondary" href="@(ResourceService.BucketItem("supportChat", message.Attachment))">
+                                                                                            <i class="me-2 bx bx-download"></i> @(message.Attachment)
+                                                                                        </a>
+                                                                                    }
+                                                                                </div>
+                                                                            }
                                                                         }
                                                                     </div>
-                                                                }
-                                                            }
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            }
-                                            else
-                                            {
-                                                <div class="d-flex justify-content-start mb-10 ">
-                                                    <div class="d-flex flex-column align-items-start">
-                                                        <div class="d-flex align-items-center mb-2">
-                                                            <div class="symbol  symbol-35px symbol-circle ">
-                                                                <img alt="Avatar" src="@(ResourceService.Avatar(message.Sender))">
-                                                            </div>
-                                                            <div class="ms-3">
-                                                                <a class="fs-5 fw-bold text-gray-900 text-hover-primary me-1">
-                                                                    <span>@(message.Sender.FirstName) @(message.Sender.LastName)</span>
-                                                                </a>
-                                                                <span class="text-muted fs-7 mb-1">@(Formatter.FormatAgoFromDateTime(message.CreatedAt, SmartTranslateService))</span>
-                                                            </div>
-                                                        </div>
-
-                                                        <div class="p-5 rounded bg-light-info text-dark fw-semibold mw-lg-400px text-start">
-                                                            @{ 
-                                                                int i = 0;
-                                                                var arr = message.Content.Split("\n", StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);}
-                                                            @foreach (var line in arr)
-                                                            {
-                                                                @line
-                                                                if (i++ != arr.Length - 1)
-                                                                {
-                                                                    <br />
-                                                                }
-                                                            }
-
-                                                            @if (message.Attachment != "")
-                                                            {
-                                                                <div class="mt-3">
-                                                                    @if (Regex.IsMatch(message.Attachment, @"\.(jpg|jpeg|png|gif|bmp)$"))
-                                                                    {
-                                                                        <img src="@(ResourceService.BucketItem("supportChat", message.Attachment))" class="img-fluid" alt="Attachment"/>
-                                                                    }
-                                                                    else
-                                                                    {
-                                                                        <a class="btn btn-secondary" href="@(ResourceService.BucketItem("supportChat", message.Attachment))">
-                                                                            <i class="me-2 bx bx-download"></i> @(message.Attachment)
-                                                                        </a>
-                                                                    }
                                                                 </div>
-                                                            }
-                                                        </div>
-                                                    </div>
+                                                            </div>
+                                                        }
+                                                        else
+                                                        {
+                                                            <div class="d-flex justify-content-start mb-10 ">
+                                                                <div class="d-flex flex-column align-items-start">
+                                                                    <div class="d-flex align-items-center mb-2">
+                                                                        <div class="symbol  symbol-35px symbol-circle ">
+                                                                            <img alt="Avatar" src="@(ResourceService.Avatar(message.Sender))">
+                                                                        </div>
+                                                                        <div class="ms-3">
+                                                                            <a class="fs-5 fw-bold text-gray-900 text-hover-primary me-1">
+                                                                                <span>@(message.Sender.FirstName) @(message.Sender.LastName)</span>
+                                                                            </a>
+                                                                            <span class="text-muted fs-7 mb-1">@(Formatter.FormatAgoFromDateTime(message.CreatedAt, SmartTranslateService))</span>
+                                                                        </div>
+                                                                    </div>
+            
+                                                                    <div class="p-5 rounded bg-light-info text-dark fw-semibold mw-lg-400px text-start">
+                                                                        @{ 
+                                                                            int i = 0;
+                                                                            var arr = message.Content.Split("\n", StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);}
+                                                                        @foreach (var line in arr)
+                                                                        {
+                                                                            @line
+                                                                            if (i++ != arr.Length - 1)
+                                                                            {
+                                                                                <br />
+                                                                            }
+                                                                        }
+            
+                                                                        @if (message.Attachment != "")
+                                                                        {
+                                                                            <div class="mt-3">
+                                                                                @if (Regex.IsMatch(message.Attachment, @"\.(jpg|jpeg|png|gif|bmp)$"))
+                                                                                {
+                                                                                    <img src="@(ResourceService.BucketItem("supportChat", message.Attachment))" class="img-fluid" alt="Attachment"/>
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                    <a class="btn btn-secondary" href="@(ResourceService.BucketItem("supportChat", message.Attachment))">
+                                                                                        <i class="me-2 bx bx-download"></i> @(message.Attachment)
+                                                                                    </a>
+                                                                                }
+                                                                            </div>
+                                                                        }
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        }
+                                                    }
                                                 </div>
-                                            }
-                                        }
-                                    </div>
-                                </LazyLoader>
-                            </div>
-                            <div class="card-footer">
-                                @if (Typing.Any())
-                                {
-                                    <span class="mb-5 fs-5 d-flex flex-row">
-                                        <div class="wave me-1">
-                                            <div class="dot h-5px w-5px" style="margin-right: 1px;"></div>
-                                            <div class="dot h-5px w-5px" style="margin-right: 1px;"></div>
-                                            <div class="dot h-5px w-5px"></div>
+                                            </LazyLoader>
                                         </div>
-                                        @if (Typing.Length > 1)
-                                        {
-                                            <span>
-                                                @(Typing.Aggregate((current, next) => current + ", " + next)) <TL>are typing</TL>
+                                        <div class="card-footer">
+                                            @if (Typing.Any())
+                                            {
+                                                <span class="mb-5 fs-5 d-flex flex-row">
+                                                    <div class="wave me-1">
+                                                        <div class="dot h-5px w-5px" style="margin-right: 1px;"></div>
+                                                        <div class="dot h-5px w-5px" style="margin-right: 1px;"></div>
+                                                        <div class="dot h-5px w-5px"></div>
+                                                    </div>
+                                                    @if (Typing.Length > 1)
+                                                    {
+                                                        <span>
+                                                            @(Typing.Aggregate((current, next) => current + ", " + next)) <TL>are typing</TL>
+                                                        </span>
+                                                    }
+                                                    else
+                                                    {
+                                                        <span>
+                                                            @(Typing.First()) <TL>is typing</TL>
+                                                        </span>
+                                                    }
+                                                </span>
+                                            }
+            
+                                            <div class="d-flex flex-stack">
+                                                <table class="w-100">
+                                                    <tr>
+                                                        <td class="align-top">
+                                                            <SmartFileSelect @ref="SmartFileSelect"></SmartFileSelect>
+                                                        </td>
+                                                        <td class="w-100">
+                                                            <textarea @bind="Content" @oninput="OnTyping" class="form-control mb-3 form-control-flush" rows="1" placeholder="Type a message">            
+                                                            </textarea>
+                                                        </td>
+                                                        <td class="align-top">
+                                                            <WButton Text="@(SmartTranslateService.Translate("Send"))"
+                                                                     WorkingText="@(SmartTranslateService.Translate("Sending"))"
+                                                                     CssClasses="btn-primary ms-2"
+                                                                     OnClick="Send">
+                                                            </WButton>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="flex-column flex-lg-row-auto w-100 mw-lg-300px mw-xxl-350px">
+                                    <div class="card p-10 mb-15 pb-8">
+                                        <h2 class="text-dark fw-bold mb-2">
+                                            <TL>User information</TL>
+                                        </h2>
+            
+                                        <div class="d-flex align-items-center mb-1">
+                                            <span class="fw-semibold text-gray-800 fs-5 m-0">
+                                                <TL>Name</TL>: @(User.FirstName) @User.LastName
                                             </span>
-                                        }
-                                        else
-                                        {
-                                            <span>
-                                                @(Typing.First()) <TL>is typing</TL>
+                                        </div>
+                                        <div class="d-flex align-items-center mb-2">
+                                            <span class="fw-semibold text-gray-800 fs-5 m-0">
+                                                <TL>Email</TL>: <a href="/admin/users/view/@User.Id">@(User.Email)</a>
                                             </span>
-                                        }
-                                    </span>
-                                }
-
-                                <div class="d-flex flex-stack">
-                                    <table class="w-100">
-                                        <tr>
-                                            <td class="align-top">
-                                                <SmartFileSelect @ref="SmartFileSelect"></SmartFileSelect>
-                                            </td>
-                                            <td class="w-100">
-                                                <textarea @bind="Content" @oninput="OnTyping" class="form-control mb-3 form-control-flush" rows="1" placeholder="Type a message">            
-                                                </textarea>
-                                            </td>
-                                            <td class="align-top">
-                                                <WButton Text="@(SmartTranslateService.Translate("Send"))"
-                                                         WorkingText="@(SmartTranslateService.Translate("Sending"))"
-                                                         CssClasses="btn-primary ms-2"
-                                                         OnClick="Send">
+                                        </div>
+                                        <div class="align-items-center mt-3">
+                                            <span class="fw-semibold text-gray-800 fs-5 m-0">
+                                                <WButton Text="@(SmartTranslateService.Translate("Close ticket"))"
+                                                         WorkingText="@(SmartTranslateService.Translate("Closing"))"
+                                                         CssClasses="btn-danger float-end"
+                                                         OnClick="CloseTicket">
                                                 </WButton>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                            </span>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="flex-column flex-lg-row-auto w-100 mw-lg-300px mw-xxl-350px">
-                        <div class="card p-10 mb-15 pb-8">
-                            <h2 class="text-dark fw-bold mb-2">
-                                <TL>User information</TL>
-                            </h2>
-
-                            <div class="d-flex align-items-center mb-1">
-                                <span class="fw-semibold text-gray-800 fs-5 m-0">
-                                    <TL>Name</TL>: @(User.FirstName) @User.LastName
-                                </span>
-                            </div>
-                            <div class="d-flex align-items-center mb-2">
-                                <span class="fw-semibold text-gray-800 fs-5 m-0">
-                                    <TL>Email</TL>: <a href="/admin/users/view/@User.Id">@(User.Email)</a>
-                                </span>
-                            </div>
-                            <div class="align-items-center mt-3">
-                                <span class="fw-semibold text-gray-800 fs-5 m-0">
-                                    <WButton Text="@(SmartTranslateService.Translate("Close ticket"))"
-                                             WorkingText="@(SmartTranslateService.Translate("Closing"))"
-                                             CssClasses="btn-danger float-end"
-                                             OnClick="CloseTicket">
-                                    </WButton>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        }
-    </LazyLoader>
-</OnlyAdmin>
+                    }
+                </LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Sys/Configuration.razor b/Moonlight/Shared/Views/Admin/Sys/Configuration.razor
index eb945763..9676ab0e 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Configuration.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/Configuration.razor
@@ -9,7 +9,7 @@
 @inject ToastService ToastService
 @inject SmartTranslateService SmartTranslateService
 
-@attribute [PermissionRequired(nameof(Permissions.SystemConfiguration))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysConfiguration))]
 
 <AdminSystemNavigation Index="8"/>
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/DiscordBot.razor b/Moonlight/Shared/Views/Admin/Sys/DiscordBot.razor
index 037183a6..b86ddd0d 100644
--- a/Moonlight/Shared/Views/Admin/Sys/DiscordBot.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/DiscordBot.razor
@@ -4,7 +4,7 @@
 
 @inject DiscordBotService DiscordBotService
 
-@attribute [PermissionRequired(nameof(Permissions.DiscordBot))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysDiscordBot))]
 
 <AdminSystemNavigation Index="6"/>
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/Index.razor b/Moonlight/Shared/Views/Admin/Sys/Index.razor
index 9d6e6b03..496e1c9f 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/Index.razor
@@ -7,7 +7,7 @@
 @inject HostSystemHelper HostSystemHelper
 @inject MoonlightService MoonlightService
 
-@attribute [PermissionRequired(nameof(Permissions.SystemDashboard))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSystem))]
 
 <AdminSystemNavigation Index="0"/>
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/Mail.razor b/Moonlight/Shared/Views/Admin/Sys/Mail.razor
index 6b918cfa..6a9c8fb4 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Mail.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/Mail.razor
@@ -5,18 +5,19 @@
 @using Moonlight.App.Helpers.Files
 @using Moonlight.App.Helpers
 @using BlazorTable
-@using Moonlight.App.Database.Entities
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
 @using Moonlight.App.Services.Mail
+@using Moonlight.App.Services.Sessions
 
 @inject SmartTranslateService SmartTranslateService
 @inject ToastService ToastService
 @inject AlertService AlertService
 @inject MailService MailService
+@inject IdentityService IdentityService
 
-@attribute [PermissionRequired(nameof(Permissions.SystemMail))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysMail))]
 
 <AdminSystemNavigation Index="9"/>
 
@@ -92,8 +93,7 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     private MailTemplate[] MailTemplateFiles;
     private FileAccess FileAccess;
@@ -174,7 +174,7 @@
 
     private async Task SendTestMail()
     {
-        await MailService.SendMailRaw(User, "<html><body>If you see this mail, your moonlight mail configuration is ready to use</body></html>");
+        await MailService.SendMailRaw(IdentityService.User, "<html><body>If you see this mail, your moonlight mail configuration is ready to use</body></html>");
         await AlertService.Info(SmartTranslateService.Translate("A test mail has been sent to the email address of your account"));
     }
 }
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Admin/Sys/Malware.razor b/Moonlight/Shared/Views/Admin/Sys/Malware.razor
index 97de8771..ccaeec64 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Malware.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/Malware.razor
@@ -14,7 +14,7 @@
 
 @implements IDisposable
 
-@attribute [PermissionRequired(nameof(Permissions.SystemMalware))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysMalware))]
 
 <AdminSystemNavigation Index="2"/>
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/News/Edit.razor b/Moonlight/Shared/Views/Admin/Sys/News/Edit.razor
index 73424fa8..86945f6e 100644
--- a/Moonlight/Shared/Views/Admin/Sys/News/Edit.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/News/Edit.razor
@@ -10,7 +10,7 @@
 @inject NavigationManager NavigationManager
 @inject NewsEntryRepository NewsEntryRepository
 
-@attribute [PermissionRequired(nameof(Permissions.NewsMessages))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysNewsEdit))]
 
 <LazyLoader Load="Load">
     @if (Entry == null)
diff --git a/Moonlight/Shared/Views/Admin/Sys/News/Index.razor b/Moonlight/Shared/Views/Admin/Sys/News/Index.razor
index afe40a7e..fac0fb58 100644
--- a/Moonlight/Shared/Views/Admin/Sys/News/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/News/Index.razor
@@ -12,7 +12,7 @@
 @inject SmartTranslateService SmartTranslateService
 @inject AlertService AlertService
 
-@attribute [PermissionRequired(nameof(Permissions.NewsMessages))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysNews))]
 
 <AdminSystemNavigation Index="7"/>
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/News/New.razor b/Moonlight/Shared/Views/Admin/Sys/News/New.razor
index d6e28ca7..66029062 100644
--- a/Moonlight/Shared/Views/Admin/Sys/News/New.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/News/New.razor
@@ -9,7 +9,7 @@
 @inject NavigationManager NavigationManager
 @inject NewsEntryRepository NewsEntryRepository
 
-@attribute [PermissionRequired(nameof(Permissions.NewsMessages))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysNewsNew))]
 
 <div class="card mb-6">
     <div class="card-header">
diff --git a/Moonlight/Shared/Views/Admin/Sys/Resources.razor b/Moonlight/Shared/Views/Admin/Sys/Resources.razor
index 246b62e3..5f737242 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Resources.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/Resources.razor
@@ -11,7 +11,7 @@
 @inject ConfigService ConfigService
 @inject AlertService AlertService
 
-@attribute [PermissionRequired(nameof(Permissions.SystemResources))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysResources))]
 
 <AdminSystemNavigation Index="5"/>
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/Security.razor b/Moonlight/Shared/Views/Admin/Sys/Security.razor
index f74a1c0f..2f3ee141 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Security.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/Security.razor
@@ -13,7 +13,7 @@
 @inject EventSystem Event
 @inject ToastService ToastService
 
-@attribute [PermissionRequired(nameof(Permissions.SystemSecurity))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysSecurity))]
 
 <AdminSystemNavigation Index="3"/>
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/Sentry.razor b/Moonlight/Shared/Views/Admin/Sys/Sentry.razor
index 8922947e..029e7be8 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Sentry.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/Sentry.razor
@@ -3,7 +3,7 @@
 @using Moonlight.Shared.Components.Navigations
 @using global::Sentry
 
-@attribute [PermissionRequired(nameof(Permissions.SystemSentry))]
+@attribute [PermissionRequired(nameof(Permissions.AdminSysSentry))]
 
 <AdminSystemNavigation Index="1"/>
 
diff --git a/Moonlight/Shared/Views/Admin/Users/Edit.razor b/Moonlight/Shared/Views/Admin/Users/Edit.razor
index cc220007..2586705f 100644
--- a/Moonlight/Shared/Views/Admin/Users/Edit.razor
+++ b/Moonlight/Shared/Views/Admin/Users/Edit.razor
@@ -12,8 +12,9 @@
 @inject ToastService ToastService
 @inject SmartTranslateService SmartTranslateService
 
-<OnlyAdmin>
-    <LazyLoader Load="Load">
+@attribute [PermissionRequired(nameof(Permissions.AdminUserEdit))]
+
+<LazyLoader Load="Load">
         @if (User == null)
         {
             <div class="alert alert-danger">
@@ -156,7 +157,6 @@
         
         <PermissionEditor @ref="PermissionEditor" OnSave="SavePermissions" />
     </LazyLoader>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Users/Index.razor b/Moonlight/Shared/Views/Admin/Users/Index.razor
index b4d93243..1ad31b1b 100644
--- a/Moonlight/Shared/Views/Admin/Users/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Users/Index.razor
@@ -9,50 +9,50 @@
 @inject UserRepository UserRepository
 @inject SmartTranslateService SmartTranslateService
 
-<OnlyAdmin>
-    <AdminSessionNavigation Index="0"/>
+@attribute [PermissionRequired(nameof(Permissions.AdminUsers))]
 
-    <div class="card">
-        <LazyLoader Load="Load">
-            <div class="card-header border-0 pt-5">
-                <h3 class="card-title align-items-start flex-column">
-                    <span class="card-label fw-bold fs-3 mb-1">
-                        <TL>Users</TL>
-                    </span>
-                </h3>
-                <div class="card-toolbar">
-                    <a href="/admin/users/new" class="btn btn-sm btn-light-success">
-                        <i class="bx bx-user-plus"></i>
-                        <TL>New user</TL>
-                    </a>
-                </div>
+<AdminSessionNavigation Index="0"/>
+
+<div class="card">
+    <LazyLoader Load="Load">
+        <div class="card-header border-0 pt-5">
+            <h3 class="card-title align-items-start flex-column">
+                <span class="card-label fw-bold fs-3 mb-1">
+                    <TL>Users</TL>
+                </span>
+            </h3>
+            <div class="card-toolbar">
+                <a href="/admin/users/new" class="btn btn-sm btn-light-success">
+                    <i class="bx bx-user-plus"></i>
+                    <TL>New user</TL>
+                </a>
             </div>
-            <div class="card-body">
-                <div class="table-responsive">
-                    <Table TableItem="User" Items="Users" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                        <Column TableItem="User" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="User" Title="@(SmartTranslateService.Translate("Email"))" Field="@(x => x.Email)" Sortable="true" Filterable="true">
-                            <Template>
-                                <a href="/admin/users/view/@(context.Id)">@(context.Email)</a>
-                            </Template>
-                        </Column>
-                        <Column TableItem="User" Title="@(SmartTranslateService.Translate("First name"))" Field="@(x => x.FirstName)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="User" Title="@(SmartTranslateService.Translate("Last name"))" Field="@(x => x.LastName)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="User" Title="@(SmartTranslateService.Translate("Created at"))" Field="@(x => x.CreatedAt)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="User" Title="@(SmartTranslateService.Translate("Manage"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                            <Template>
-                                <a href="/admin/users/edit/@(context.Id)/">
-                                    <TL>Manage</TL>
-                                </a>
-                            </Template>
-                        </Column>
-                        <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                    </Table>
-                </div>
+        </div>
+        <div class="card-body">
+            <div class="table-responsive">
+                <Table TableItem="User" Items="Users" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                    <Column TableItem="User" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="User" Title="@(SmartTranslateService.Translate("Email"))" Field="@(x => x.Email)" Sortable="true" Filterable="true">
+                        <Template>
+                            <a href="/admin/users/view/@(context.Id)">@(context.Email)</a>
+                        </Template>
+                    </Column>
+                    <Column TableItem="User" Title="@(SmartTranslateService.Translate("First name"))" Field="@(x => x.FirstName)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="User" Title="@(SmartTranslateService.Translate("Last name"))" Field="@(x => x.LastName)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="User" Title="@(SmartTranslateService.Translate("Created at"))" Field="@(x => x.CreatedAt)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="User" Title="@(SmartTranslateService.Translate("Manage"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                        <Template>
+                            <a href="/admin/users/edit/@(context.Id)/">
+                                <TL>Manage</TL>
+                            </a>
+                        </Template>
+                    </Column>
+                    <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                </Table>
             </div>
-        </LazyLoader>
-    </div>
-</OnlyAdmin>
+        </div>
+    </LazyLoader>
+</div>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Users/New.razor b/Moonlight/Shared/Views/Admin/Users/New.razor
index 29d611ca..5be64b28 100644
--- a/Moonlight/Shared/Views/Admin/Users/New.razor
+++ b/Moonlight/Shared/Views/Admin/Users/New.razor
@@ -8,50 +8,50 @@
 @inject ToastService ToastService
 @inject UserService UserService
 
-<OnlyAdmin>
-    <div class="row mb-5">
-        <div class="card card-body p-10">
-            <label class="form-label">
-                <TL>First name</TL>
-            </label>
-            <div class="input-group mb-5">
-                <input @bind="User.FirstName" type="text" class="form-control">
-            </div>
-            <label class="form-label">
-                <TL>Last name</TL>
-            </label>
-            <div class="input-group mb-5">
-                <input @bind="User.LastName" type="text" class="form-control">
-            </div>
-            <label class="form-label">
-                <TL>Email</TL>
-            </label>
-            <div class="input-group mb-5">
-                <input @bind="User.Email" type="email" class="form-control">
-            </div>
-            <label class="form-label">
-                <TL>Password</TL>
-            </label>
-            <div class="input-group mb-5">
-                <input @bind="User.Password" type="password" class="form-control">
-            </div>
+@attribute [PermissionRequired(nameof(Permissions.AdminNewUser))]
+
+<div class="row mb-5">
+    <div class="card card-body p-10">
+        <label class="form-label">
+            <TL>First name</TL>
+        </label>
+        <div class="input-group mb-5">
+            <input @bind="User.FirstName" type="text" class="form-control">
+        </div>
+        <label class="form-label">
+            <TL>Last name</TL>
+        </label>
+        <div class="input-group mb-5">
+            <input @bind="User.LastName" type="text" class="form-control">
+        </div>
+        <label class="form-label">
+            <TL>Email</TL>
+        </label>
+        <div class="input-group mb-5">
+            <input @bind="User.Email" type="email" class="form-control">
+        </div>
+        <label class="form-label">
+            <TL>Password</TL>
+        </label>
+        <div class="input-group mb-5">
+            <input @bind="User.Password" type="password" class="form-control">
         </div>
     </div>
-    <div class="row">
-        <div class="card card-body">
-            <div class="d-flex justify-content-end">
-                <a href="/admin/users" class="btn btn-danger me-3">
-                    <TL>Cancel</TL>
-                </a>
-                <WButton Text="@(SmartTranslateService.Translate("Create"))"
-                         WorkingText="@(SmartTranslateService.Translate("Creating"))"
-                         CssClasses="btn-success"
-                         OnClick="Create">
-                </WButton>
-            </div>
+</div>
+<div class="row">
+    <div class="card card-body">
+        <div class="d-flex justify-content-end">
+            <a href="/admin/users" class="btn btn-danger me-3">
+                <TL>Cancel</TL>
+            </a>
+            <WButton Text="@(SmartTranslateService.Translate("Create"))"
+                     WorkingText="@(SmartTranslateService.Translate("Creating"))"
+                     CssClasses="btn-success"
+                     OnClick="Create">
+            </WButton>
         </div>
     </div>
-</OnlyAdmin>
+</div>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Users/Sessions.razor b/Moonlight/Shared/Views/Admin/Users/Sessions.razor
index a9df5cf1..197a493e 100644
--- a/Moonlight/Shared/Views/Admin/Users/Sessions.razor
+++ b/Moonlight/Shared/Views/Admin/Users/Sessions.razor
@@ -13,91 +13,91 @@
 @inject AlertService AlertService
 @inject ToastService ToastService
 
-<OnlyAdmin>
-    <AdminSessionNavigation Index="1"/>
+@attribute [PermissionRequired(nameof(Permissions.AdminUserSessions))]
 
-    <div class="card">
-        <LazyLoader Load="Load">
-            <div class="card-header border-0 pt-5">
-                <h3 class="card-title align-items-start flex-column">
-                    <span class="card-label fw-bold fs-3 mb-1">
-                        <TL>Sessions</TL>
-                    </span>
-                </h3>
-                <div class="card-toolbar">
-                    <button class="btn btn-sm btn-primary me-3" @onclick="Refresh">
-                        <i class="bx bx-revision"></i>
-                        <TL>Refresh</TL>
-                    </button>
-                    <button class="btn btn-sm btn-warning" @onclick="MessageAll">
-                        <i class="bx bx-message-square-dots"></i>
-                        <TL>Send a message to all users</TL>
-                    </button>
+<AdminSessionNavigation Index="1"/>
+
+<div class="card">
+    <LazyLoader Load="Load">
+        <div class="card-header border-0 pt-5">
+            <h3 class="card-title align-items-start flex-column">
+                <span class="card-label fw-bold fs-3 mb-1">
+                    <TL>Sessions</TL>
+                </span>
+            </h3>
+            <div class="card-toolbar">
+                <button class="btn btn-sm btn-primary me-3" @onclick="Refresh">
+                    <i class="bx bx-revision"></i>
+                    <TL>Refresh</TL>
+                </button>
+                <button class="btn btn-sm btn-warning" @onclick="MessageAll">
+                    <i class="bx bx-message-square-dots"></i>
+                    <TL>Send a message to all users</TL>
+                </button>
+            </div>
+        </div>
+        <div class="card-body pt-0">
+            @if (AllSessions == null)
+            {
+                <div class="alert alert-info">
+                    <span class="spinner-border spinner-border-sm align-middle me-2"></span>
+                    <TL>Loading sessions</TL>
                 </div>
-            </div>
-            <div class="card-body pt-0">
-                @if (AllSessions == null)
-                {
-                    <div class="alert alert-info">
-                        <span class="spinner-border spinner-border-sm align-middle me-2"></span>
-                        <TL>Loading sessions</TL>
-                    </div>
-                }
-                else
-                {
-                    <Table TableItem="SessionClientService" Items="AllSessions" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Email"))" Field="@(x => x.User.Email)" Sortable="true" Filterable="true" Width="20%">
-                            <Template>
-                                @if (context.User == null)
-                                {
-                                    <TL>Guest</TL>
-                                }
-                                else
-                                {
-                                    <a href="/admin/users/view/@(context.User.Id)">@(context.User.Email)</a>
-                                }
-                            </Template>
-                        </Column>
-                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("IP"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
-                            <Template>
-                                @(context.Ip)
-                            </Template>
-                        </Column>
-                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("URL"))" Field="@(x => x.NavigationManager.Uri)" Sortable="true" Filterable="true" Width="10%"/>
-                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Device"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
-                            <Template>
-                                @(context.Device)
-                            </Template>
-                        </Column>
-                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Time"))" Field="@(x => x.CreateTimestamp)" Sortable="true" Filterable="true" Width="10%">
-                            <Template>
-                                @{
-                                    var time = Formatter.FormatUptime((DateTime.UtcNow - context.CreateTimestamp).TotalMilliseconds);
-                                }
-                                <span>@(time)</span>
-                            </Template>
-                        </Column>
-                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Actions"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
-                            <Template>
-                                <button @onclick="() => Navigate(context)" class="btn btn-sm btn-primary">
-                                    <TL>Change url</TL>
-                                </button>
-                            </Template>
-                        </Column>
-                        <Column TableItem="SessionClientService" Title="" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
-                            <Template>
-                                <button @onclick="() => Message(context)" class="btn btn-sm btn-warning">
-                                    <TL>Message</TL>
-                                </button>
-                            </Template>
-                        </Column>
-                        <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                    </Table>
-                }
-            </div>
-        </LazyLoader>
-    </div>
-</OnlyAdmin>
+            }
+            else
+            {
+                <Table TableItem="SessionClientService" Items="AllSessions" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                    <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Email"))" Field="@(x => x.User.Email)" Sortable="true" Filterable="true" Width="20%">
+                        <Template>
+                            @if (context.User == null)
+                            {
+                                <TL>Guest</TL>
+                            }
+                            else
+                            {
+                                <a href="/admin/users/view/@(context.User.Id)">@(context.User.Email)</a>
+                            }
+                        </Template>
+                    </Column>
+                    <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("IP"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
+                        <Template>
+                            @(context.Ip)
+                        </Template>
+                    </Column>
+                    <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("URL"))" Field="@(x => x.NavigationManager.Uri)" Sortable="true" Filterable="true" Width="10%"/>
+                    <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Device"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
+                        <Template>
+                            @(context.Device)
+                        </Template>
+                    </Column>
+                    <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Time"))" Field="@(x => x.CreateTimestamp)" Sortable="true" Filterable="true" Width="10%">
+                        <Template>
+                            @{
+                                var time = Formatter.FormatUptime((DateTime.UtcNow - context.CreateTimestamp).TotalMilliseconds);
+                            }
+                            <span>@(time)</span>
+                        </Template>
+                    </Column>
+                    <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Actions"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
+                        <Template>
+                            <button @onclick="() => Navigate(context)" class="btn btn-sm btn-primary">
+                                <TL>Change url</TL>
+                            </button>
+                        </Template>
+                    </Column>
+                    <Column TableItem="SessionClientService" Title="" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
+                        <Template>
+                            <button @onclick="() => Message(context)" class="btn btn-sm btn-warning">
+                                <TL>Message</TL>
+                            </button>
+                        </Template>
+                    </Column>
+                    <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                </Table>
+            }
+        </div>
+    </LazyLoader>
+</div>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Users/View.razor b/Moonlight/Shared/Views/Admin/Users/View.razor
index 0be9057a..fc4641cd 100644
--- a/Moonlight/Shared/Views/Admin/Users/View.razor
+++ b/Moonlight/Shared/Views/Admin/Users/View.razor
@@ -10,236 +10,236 @@
 @inject ServerRepository ServerRepository
 @inject DomainRepository DomainRepository
 
-<OnlyAdmin>
+@attribute [PermissionRequired(nameof(Permissions.AdminUserView))]
+
 <LazyLoader Load="Load">
-@if (User == null)
-{
-    <div class="alert alert-danger">
-        <TL>No user with this id found</TL>
-    </div>
-}
-else
-{
-    <div class="row">
-    <div class="col-md-4">
-        <div class="card card-body mb-5">
-            <div class="d-flex flex-column align-items-center text-center">
-                <img src="/api/moonlight/avatar/@(User.Id)" class="rounded-circle" alt="Profile picture" width="150">
-            </div>
-        </div>
-        <div class="card card-body mb-5">
-            <div class="btn-group">
-                <a class="btn btn-primary" href="/admin/users/edit/@(User.Id)">
-                    <TL>Edit</TL>
-                </a>
-                <a class="btn btn-secondary" href="/admin/users">
-                    <TL>Back to list</TL>
-                </a>
-                <a class="btn btn-primary" href="/admin/support/view/@(User.Id)">
-                    <TL>Open support</TL>
-                </a>
-            </div>
-        </div>
-        <div class="card card-xl-stretch mb-5">
-            <div class="card-header border-0">
-                <h3 class="card-title fw-bold text-dark">
-                    <TL>Servers</TL>
-                </h3>
-            </div>
-            <div class="card-body pt-2">
-                @foreach (var server in Servers)
-                {
-                    <div class="d-flex align-items-center">
-                        <div class="flex-grow-1">
-                            <a href="/server/@(server.Uuid)" class="fs-6">@(server.Name) - @(server.Image.Name)</a>
+            @if (User == null)
+            {
+                <div class="alert alert-danger">
+                    <TL>No user with this id found</TL>
+                </div>
+            }
+            else
+            {
+                <div class="row">
+                <div class="col-md-4">
+                    <div class="card card-body mb-5">
+                        <div class="d-flex flex-column align-items-center text-center">
+                            <img src="/api/moonlight/avatar/@(User.Id)" class="rounded-circle" alt="Profile picture" width="150">
                         </div>
                     </div>
-
-                    if (server != Servers.Last())
-                    {
-                        <div class="separator my-4"></div>
-                    }
-                }
-            </div>
-        </div>
-        <div class="card card-xl-stretch">
-            <div class="card-header border-0">
-                <h3 class="card-title fw-bold text-dark">
-                    <TL>Domains</TL>
-                </h3>
-            </div>
-            <div class="card-body pt-2">
-                @foreach (var domain in Domains)
-                {
-                    <div class="d-flex align-items-center">
-                        <div class="flex-grow-1">
-                            <a href="/domain/@(domain.Id)" class="fs-6">@(domain.Name).@(domain.SharedDomain.Name)</a>
+                    <div class="card card-body mb-5">
+                        <div class="btn-group">
+                            <a class="btn btn-primary" href="/admin/users/edit/@(User.Id)">
+                                <TL>Edit</TL>
+                            </a>
+                            <a class="btn btn-secondary" href="/admin/users">
+                                <TL>Back to list</TL>
+                            </a>
+                            <a class="btn btn-primary" href="/admin/support/view/@(User.Id)">
+                                <TL>Open support</TL>
+                            </a>
                         </div>
                     </div>
-
-                    if (domain != Domains.Last())
-                    {
-                        <div class="separator my-4"></div>
-                    }
-                }
-            </div>
-        </div>
-    </div>
-    <div class="col-md-8">
-        <div class="card mb-3">
-            <div class="card-body fs-6">
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>First name</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.FirstName)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Last name</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.LastName)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Email</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.Email)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Address</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.Address)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>City</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.City)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>State</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.State)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Country</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.Country)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Admin</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">
-                            @if (User.Admin)
+                    <div class="card card-xl-stretch mb-5">
+                        <div class="card-header border-0">
+                            <h3 class="card-title fw-bold text-dark">
+                                <TL>Servers</TL>
+                            </h3>
+                        </div>
+                        <div class="card-body pt-2">
+                            @foreach (var server in Servers)
                             {
-                                <span>✅</span>
+                                <div class="d-flex align-items-center">
+                                    <div class="flex-grow-1">
+                                        <a href="/server/@(server.Uuid)" class="fs-6">@(server.Name) - @(server.Image.Name)</a>
+                                    </div>
+                                </div>
+            
+                                if (server != Servers.Last())
+                                {
+                                    <div class="separator my-4"></div>
+                                }
                             }
-                            else
+                        </div>
+                    </div>
+                    <div class="card card-xl-stretch">
+                        <div class="card-header border-0">
+                            <h3 class="card-title fw-bold text-dark">
+                                <TL>Domains</TL>
+                            </h3>
+                        </div>
+                        <div class="card-body pt-2">
+                            @foreach (var domain in Domains)
                             {
-                                <span>❌</span>
+                                <div class="d-flex align-items-center">
+                                    <div class="flex-grow-1">
+                                        <a href="/domain/@(domain.Id)" class="fs-6">@(domain.Name).@(domain.SharedDomain.Name)</a>
+                                    </div>
+                                </div>
+            
+                                if (domain != Domains.Last())
+                                {
+                                    <div class="separator my-4"></div>
+                                }
                             }
-                        </span>
+                        </div>
                     </div>
                 </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Status</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.Status)</span>
+                <div class="col-md-8">
+                    <div class="card mb-3">
+                        <div class="card-body fs-6">
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>First name</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.FirstName)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Last name</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.LastName)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Email</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.Email)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Address</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.Address)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>City</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.City)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>State</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.State)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Country</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.Country)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Admin</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">
+                                        @if (User.Admin)
+                                        {
+                                            <span>✅</span>
+                                        }
+                                        else
+                                        {
+                                            <span>❌</span>
+                                        }
+                                    </span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Status</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.Status)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Totp</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.TotpEnabled)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Discord</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.DiscordId)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Subscription</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">
+            
+                                    </span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Created at</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(Formatter.FormatDate(User.CreatedAt))</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Register ip</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.RegisterIp)</span>
+                                </div>
+                            </div>
+                            <div class="separator my-4"></div>
+                            <div class="row">
+                                <label class="col-lg-4 fw-semibold text-muted">
+                                    <TL>Last ip</TL>
+                                </label>
+                                <div class="col-lg-8">
+                                    <span class="fw-bold fs-6 text-gray-800">@(User.LastIp)</span>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Totp</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.TotpEnabled)</span>
-                    </div>
                 </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Discord</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.DiscordId)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Subscription</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">
-
-                        </span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Created at</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(Formatter.FormatDate(User.CreatedAt))</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Register ip</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.RegisterIp)</span>
-                    </div>
-                </div>
-                <div class="separator my-4"></div>
-                <div class="row">
-                    <label class="col-lg-4 fw-semibold text-muted">
-                        <TL>Last ip</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <span class="fw-bold fs-6 text-gray-800">@(User.LastIp)</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    </div>
-}
-</LazyLoader>
-</OnlyAdmin>
+            }
+            </LazyLoader>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Webspaces/Index.razor b/Moonlight/Shared/Views/Admin/Webspaces/Index.razor
index 9bca40d0..e609b5a4 100644
--- a/Moonlight/Shared/Views/Admin/Webspaces/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Webspaces/Index.razor
@@ -11,62 +11,62 @@
 @inject Repository<WebSpace> WebSpaceRepository
 @inject WebSpaceService WebSpaceService
 
-<OnlyAdmin>
-    <AdminWebspacesNavigation Index="0"/>
+@attribute [PermissionRequired(nameof(Permissions.AdminWebspaces))]
 
-    <div class="card">
-        <div class="card-header border-0 pt-5">
-            <h3 class="card-title align-items-start flex-column">
-                <span class="card-label fw-bold fs-3 mb-1">
-                    <TL>Webspaces</TL>
-                </span>
-            </h3>
-            <div class="card-toolbar">
-                <a href="/admin/webspaces/new" class="btn btn-sm btn-light-success">
-                    <i class="bx bx-user-plus"></i>
-                    <TL>New webspace</TL>
-                </a>
-            </div>
-        </div>
-        <div class="card-body">
-            <LazyLoader @ref="LazyLoader" Load="Load">
-                <div class="table-responsive">
-                    <Table TableItem="WebSpace" Items="WebSpaces" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                        <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Domain"))" Field="@(x => x.Domain)" Sortable="true" Filterable="true">
-                            <Template>
-                                <a href="/webspace/@(context.Id)/">
-                                    @(context.Domain)
-                                </a>
-                            </Template>
-                        </Column>
-                        <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Owner"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                            <Template>
-                                <a href="/admin/users/view/@(context.Owner.Id)">
-                                    @(context.Owner.Email)
-                                </a>
-                            </Template>
-                        </Column>
-                        <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Cloud panel"))" Field="@(x => x.CloudPanel.Name)" Sortable="true" Filterable="true">
-                            <Template>
-                                <a href="/admin/webspaces/servers/edit/@(context.CloudPanel.Id)/">
-                                    @(context.CloudPanel.Name)
-                                </a>
-                            </Template>
-                        </Column>
-                        <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Manage"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                            <Template>
-                                <DeleteButton Confirm="true" OnClick="() => Delete(context)">
-                                </DeleteButton>
-                            </Template>
-                        </Column>
-                        <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                    </Table>
-                </div>
-            </LazyLoader>
+<AdminWebspacesNavigation Index="0"/>
+
+<div class="card">
+    <div class="card-header border-0 pt-5">
+        <h3 class="card-title align-items-start flex-column">
+            <span class="card-label fw-bold fs-3 mb-1">
+                <TL>Webspaces</TL>
+            </span>
+        </h3>
+        <div class="card-toolbar">
+            <a href="/admin/webspaces/new" class="btn btn-sm btn-light-success">
+                <i class="bx bx-user-plus"></i>
+                <TL>New webspace</TL>
+            </a>
         </div>
     </div>
-</OnlyAdmin>
+    <div class="card-body">
+        <LazyLoader @ref="LazyLoader" Load="Load">
+            <div class="table-responsive">
+                <Table TableItem="WebSpace" Items="WebSpaces" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                    <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Domain"))" Field="@(x => x.Domain)" Sortable="true" Filterable="true">
+                        <Template>
+                            <a href="/webspace/@(context.Id)/">
+                                @(context.Domain)
+                            </a>
+                        </Template>
+                    </Column>
+                    <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Owner"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                        <Template>
+                            <a href="/admin/users/view/@(context.Owner.Id)">
+                                @(context.Owner.Email)
+                            </a>
+                        </Template>
+                    </Column>
+                    <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Cloud panel"))" Field="@(x => x.CloudPanel.Name)" Sortable="true" Filterable="true">
+                        <Template>
+                            <a href="/admin/webspaces/servers/edit/@(context.CloudPanel.Id)/">
+                                @(context.CloudPanel.Name)
+                            </a>
+                        </Template>
+                    </Column>
+                    <Column TableItem="WebSpace" Title="@(SmartTranslateService.Translate("Manage"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                        <Template>
+                            <DeleteButton Confirm="true" OnClick="() => Delete(context)">
+                            </DeleteButton>
+                        </Template>
+                    </Column>
+                    <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                </Table>
+            </div>
+        </LazyLoader>
+    </div>
+</div>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Webspaces/New.razor b/Moonlight/Shared/Views/Admin/Webspaces/New.razor
index 2ea2b6b4..eaa7267b 100644
--- a/Moonlight/Shared/Views/Admin/Webspaces/New.razor
+++ b/Moonlight/Shared/Views/Admin/Webspaces/New.razor
@@ -9,35 +9,35 @@
 @inject UserRepository UserRepository
 @inject NavigationManager NavigationManager
 
-<OnlyAdmin>
-    <div class="card card-body p-10">
-        <LazyLoader Load="Load">
-            <SmartForm Model="Model" OnValidSubmit="OnValidSubmit">
-                <label class="form-label">
-                    <TL>Base domain</TL>
-                </label>
-                <div class="input-group mb-5">
-                    <InputText @bind-Value="Model.BaseDomain" class="form-control"></InputText>
-                </div>
-                <label class="form-label">
-                    <TL>Owner</TL>
-                </label>
-                <div class="input-group mb-5">
-                    <SmartDropdown @bind-Value="Model.User"
-                                   Items="Users"
-                                   DisplayFunc="@(x => x.Email)"
-                                   SearchProp="@(x => x.Email)">
-                    </SmartDropdown>
-                </div>
-                <div>
-                    <button type="submit" class="btn btn-primary float-end">
-                        <TL>Create</TL>
-                    </button>
-                </div>
-            </SmartForm>
-        </LazyLoader>
-    </div>
-</OnlyAdmin>
+@attribute [PermissionRequired(nameof(Permissions.AdminNewWebspace))]
+
+<div class="card card-body p-10">
+    <LazyLoader Load="Load">
+        <SmartForm Model="Model" OnValidSubmit="OnValidSubmit">
+            <label class="form-label">
+                <TL>Base domain</TL>
+            </label>
+            <div class="input-group mb-5">
+                <InputText @bind-Value="Model.BaseDomain" class="form-control"></InputText>
+            </div>
+            <label class="form-label">
+                <TL>Owner</TL>
+            </label>
+            <div class="input-group mb-5">
+                <SmartDropdown @bind-Value="Model.User"
+                               Items="Users"
+                               DisplayFunc="@(x => x.Email)"
+                               SearchProp="@(x => x.Email)">
+                </SmartDropdown>
+            </div>
+            <div>
+                <button type="submit" class="btn btn-primary float-end">
+                    <TL>Create</TL>
+                </button>
+            </div>
+        </SmartForm>
+    </LazyLoader>
+</div>
 
 @code
 {
@@ -47,7 +47,7 @@
     private async Task OnValidSubmit()
     {
         await WebSpaceService.Create(Model.BaseDomain, Model.User);
-        
+
         NavigationManager.NavigateTo("/admin/webspaces");
     }
 
diff --git a/Moonlight/Shared/Views/Admin/Webspaces/Servers/Edit.razor b/Moonlight/Shared/Views/Admin/Webspaces/Servers/Edit.razor
index 910e22f0..df1b1f34 100644
--- a/Moonlight/Shared/Views/Admin/Webspaces/Servers/Edit.razor
+++ b/Moonlight/Shared/Views/Admin/Webspaces/Servers/Edit.razor
@@ -8,8 +8,9 @@
 @inject Repository<CloudPanel> CloudPanelRepository
 @inject NavigationManager NavigationManager
 
-<OnlyAdmin>
-    <LazyLoader Load="Load">
+@attribute [PermissionRequired(nameof(Permissions.AdminWebspacesServerEdit))]
+
+<LazyLoader Load="Load">
         @if (CloudPanel == null)
         {
             <div class="d-flex justify-content-center flex-center">
@@ -63,7 +64,6 @@
             </div>
         }
     </LazyLoader>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Webspaces/Servers/Index.razor b/Moonlight/Shared/Views/Admin/Webspaces/Servers/Index.razor
index 5e08f36b..60147bd7 100644
--- a/Moonlight/Shared/Views/Admin/Webspaces/Servers/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Webspaces/Servers/Index.razor
@@ -10,76 +10,76 @@
 @inject Repository<CloudPanel> CloudPanelRepository
 @inject WebSpaceService WebSpaceService
 
-<OnlyAdmin>
-    <AdminWebspacesNavigation Index="1"/>
+@attribute [PermissionRequired(nameof(Permissions.AdminWebspacesServers))]
 
-    <div class="card">
-        <div class="card-header border-0 pt-5">
-            <h3 class="card-title align-items-start flex-column">
-                <span class="card-label fw-bold fs-3 mb-1">
-                    <TL>Cloud panels</TL>
-                </span>
-            </h3>
-            <div class="card-toolbar">
-                <a href="/admin/webspaces/servers/new" class="btn btn-sm btn-light-success">
-                    <i class="bx bx-user-plus"></i>
-                    <TL>New cloud panel</TL>
-                </a>
-            </div>
+<AdminWebspacesNavigation Index="1"/>
+
+<div class="card">
+    <div class="card-header border-0 pt-5">
+        <h3 class="card-title align-items-start flex-column">
+            <span class="card-label fw-bold fs-3 mb-1">
+                <TL>Cloud panels</TL>
+            </span>
+        </h3>
+        <div class="card-toolbar">
+            <a href="/admin/webspaces/servers/new" class="btn btn-sm btn-light-success">
+                <i class="bx bx-user-plus"></i>
+                <TL>New cloud panel</TL>
+            </a>
         </div>
-        <div class="card-body">
-            <LazyLoader @ref="LazyLoader" Load="Load">
-                <div class="table-responsive">
-                    <Table TableItem="CloudPanel" Items="CloudPanels" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                        <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Host)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Api url"))" Field="@(x => x.ApiUrl)" Sortable="true" Filterable="true"/>
-                        <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Status"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                            <Template>
-                                @if (OnlineCache.TryGetValue(context, out var value))
+    </div>
+    <div class="card-body">
+        <LazyLoader @ref="LazyLoader" Load="Load">
+            <div class="table-responsive">
+                <Table TableItem="CloudPanel" Items="CloudPanels" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                    <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Name)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Name"))" Field="@(x => x.Host)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Api url"))" Field="@(x => x.ApiUrl)" Sortable="true" Filterable="true"/>
+                    <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Status"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                        <Template>
+                            @if (OnlineCache.TryGetValue(context, out var value))
+                            {
+                                if (value)
                                 {
-                                    if (value)
-                                    {
-                                        <span class="text-success">
-                                            <TL>Online</TL>
-                                        </span>
-                                    }
-                                    else
-                                    {
-                                        <span class="text-danger">
-                                            <TL>Offline</TL>
-                                        </span>
-                                    }
+                                    <span class="text-success">
+                                        <TL>Online</TL>
+                                    </span>
                                 }
                                 else
                                 {
-                                    <span class="text-muted">
-                                        <TL>Loading</TL>
+                                    <span class="text-danger">
+                                        <TL>Offline</TL>
                                     </span>
                                 }
-                            </Template>
-                        </Column>
-                        <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Edit"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                            <Template>
-                                <a href="/admin/webspaces/servers/edit/@(context.Id)/">
-                                    <TL>Manage</TL>
-                                </a>
-                            </Template>
-                        </Column>
-                        <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Manage"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
-                            <Template>
-                                <DeleteButton Confirm="true" OnClick="() => OnClick(context)">
-                                </DeleteButton>
-                            </Template>
-                        </Column>
-                        <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                    </Table>
-                </div>
-            </LazyLoader>
-        </div>
+                            }
+                            else
+                            {
+                                <span class="text-muted">
+                                    <TL>Loading</TL>
+                                </span>
+                            }
+                        </Template>
+                    </Column>
+                    <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Edit"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                        <Template>
+                            <a href="/admin/webspaces/servers/edit/@(context.Id)/">
+                                <TL>Manage</TL>
+                            </a>
+                        </Template>
+                    </Column>
+                    <Column TableItem="CloudPanel" Title="@(SmartTranslateService.Translate("Manage"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                        <Template>
+                            <DeleteButton Confirm="true" OnClick="() => OnClick(context)">
+                            </DeleteButton>
+                        </Template>
+                    </Column>
+                    <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                </Table>
+            </div>
+        </LazyLoader>
     </div>
-</OnlyAdmin>
+</div>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Admin/Webspaces/Servers/New.razor b/Moonlight/Shared/Views/Admin/Webspaces/Servers/New.razor
index b48af5e9..c7b959ab 100644
--- a/Moonlight/Shared/Views/Admin/Webspaces/Servers/New.razor
+++ b/Moonlight/Shared/Views/Admin/Webspaces/Servers/New.razor
@@ -7,8 +7,9 @@
 @inject Repository<CloudPanel> CloudPanelRepository
 @inject NavigationManager NavigationManager
 
-<OnlyAdmin>
-    <div class="card card-body p-10">
+@attribute [PermissionRequired(nameof(Permissions.AdminWebspacesServerNew))]
+
+<div class="card card-body p-10">
         <SmartForm Model="Model" OnValidSubmit="OnValidSubmit">
             <label class="form-label">
                 <TL>Name</TL>
@@ -41,7 +42,6 @@
             </div>
         </SmartForm>
     </div>
-</OnlyAdmin>
 
 @code
 {
diff --git a/Moonlight/Shared/Views/Domains/Create.razor b/Moonlight/Shared/Views/Domains/Create.razor
index e5efd8ea..5375c5c1 100644
--- a/Moonlight/Shared/Views/Domains/Create.razor
+++ b/Moonlight/Shared/Views/Domains/Create.razor
@@ -4,6 +4,7 @@
 @using Moonlight.App.Models.Forms
 @using Moonlight.App.Repositories.Domains
 @using Microsoft.EntityFrameworkCore
+@using Moonlight.App.Services.Sessions
 
 @inject SubscriptionService SubscriptionService
 @inject DomainService DomainService
@@ -11,6 +12,7 @@
 @inject SharedDomainRepository SharedDomainRepository
 @inject NavigationManager NavigationManager
 @inject SmartTranslateService SmartTranslateService
+@inject IdentityService IdentityService
 
 <LazyLoader Load="Load">
     @if (!SharedDomains.Any())
@@ -114,8 +116,7 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
     
     private SharedDomain[] SharedDomains;
     
@@ -130,12 +131,12 @@
         Model = new();
         
         await lazyLoader.SetText(SmartTranslateService.Translate("Loading your subscription"));
-        Subscription = await SubscriptionService.GetActiveSubscription(User);
+        Subscription = await SubscriptionService.GetActiveSubscription(IdentityService.User);
         
         AllowOrder = DomainRepository
             .Get()
             .Include(x => x.Owner)
-            .Count(x => x.Owner.Id == User.Id) < (await SubscriptionService.GetLimit(User, "domains")).Amount;
+            .Count(x => x.Owner.Id == IdentityService.User.Id) < (await SubscriptionService.GetLimit(IdentityService.User, "domains")).Amount;
 
         await lazyLoader.SetText("Loading shared domains");
         SharedDomains = SharedDomainRepository.Get().ToArray();
@@ -146,9 +147,9 @@
         if (DomainRepository
             .Get()
             .Include(x => x.Owner)
-            .Count(x => x.Owner.Id == User.Id) < (await SubscriptionService.GetLimit(User, "domains")).Amount)
+            .Count(x => x.Owner.Id == IdentityService.User.Id) < (await SubscriptionService.GetLimit(IdentityService.User, "domains")).Amount)
         {
-            var domain = await DomainService.Create(Model.Name, Model.SharedDomain, User);
+            var domain = await DomainService.Create(Model.Name, Model.SharedDomain, IdentityService.User);
             
             NavigationManager.NavigateTo($"/domain/{domain.Id}");
         }
diff --git a/Moonlight/Shared/Views/Index.razor b/Moonlight/Shared/Views/Index.razor
index 2fba00bd..708034c8 100644
--- a/Moonlight/Shared/Views/Index.razor
+++ b/Moonlight/Shared/Views/Index.razor
@@ -7,11 +7,13 @@
 @using Moonlight.App.Repositories
 @using Moonlight.App.Repositories.Domains
 @using Markdig
+@using Moonlight.App.Services.Sessions
 
 @inject ServerRepository ServerRepository
 @inject Repository<WebSpace> WebSpaceRepository
 @inject DomainRepository DomainRepository
 @inject NewsEntryRepository NewsEntryRepository
+@inject IdentityService IdentityService
 
 <LazyLoader Load="Load">
 @if (NewsEntries.Any())
@@ -243,9 +245,6 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
-
     private int ServerCount = 0;
     private int DomainCount = 0;
     private int WebSpaceCount = 0;
@@ -258,17 +257,17 @@
         ServerCount = ServerRepository
             .Get()
             .Include(x => x.Owner)
-            .Count(x => x.Owner.Id == User.Id);
+            .Count(x => x.Owner.Id == IdentityService.User.Id);
 
         DomainCount = DomainRepository
             .Get()
             .Include(x => x.Owner)
-            .Count(x => x.Owner.Id == User.Id);
+            .Count(x => x.Owner.Id == IdentityService.User.Id);
 
         WebSpaceCount = WebSpaceRepository
             .Get()
             .Include(x => x.Owner)
-            .Count(x => x.Owner.Id == User.Id);
+            .Count(x => x.Owner.Id == IdentityService.User.Id);
 
         NewsEntries = NewsEntryRepository.Get().ToList();
 
diff --git a/Moonlight/Shared/Views/Profile/Discord.razor b/Moonlight/Shared/Views/Profile/Discord.razor
index c6236d00..54862cc7 100644
--- a/Moonlight/Shared/Views/Profile/Discord.razor
+++ b/Moonlight/Shared/Views/Profile/Discord.razor
@@ -4,13 +4,15 @@
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Repositories
 @using Moonlight.App.Services
+@using Moonlight.App.Services.Sessions
 
 @inject Repository<User> UserRepository
 @inject SmartTranslateService SmartTranslateService
+@inject IdentityService IdentityService
 
 <ProfileNavigation Index="1"/>
 
-@if (User.DiscordId == 0)
+@if (IdentityService.User.DiscordId == 0)
 {
     <div class="row">
         <div class="col">
@@ -64,13 +66,12 @@ else
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     private async Task RemoveLink()
     {
-        User.DiscordId = 0;
-        UserRepository.Update(User);
+        IdentityService.User.DiscordId = 0;
+        UserRepository.Update(IdentityService.User);
 
         await InvokeAsync(StateHasChanged);
     }
diff --git a/Moonlight/Shared/Views/Profile/Index.razor b/Moonlight/Shared/Views/Profile/Index.razor
index 3c389990..215b5463 100644
--- a/Moonlight/Shared/Views/Profile/Index.razor
+++ b/Moonlight/Shared/Views/Profile/Index.razor
@@ -7,15 +7,17 @@
 @using Mappy.Net
 @using Moonlight.App.Exceptions
 @using Moonlight.App.Helpers
+@using Moonlight.App.Services.Sessions
 
-@inject UserRepository UserRepository
+@inject Repository<User> UserRepository
+@inject IdentityService IdentityService
 
 <ProfileNavigation Index="0" />
 
 <LazyLoader Load="Load">
     <SmartForm OnValidSubmit="Save" Model="Model">
         <div class="card mb-5 mb-xl-10">
-            <div class="card-body p-9 @(CurrentUser.StreamerMode ? "blur" : "")">
+            <div class="card-body p-9 @(IdentityService.User.StreamerMode ? "blur" : "")">
                 <div class="row">
                     <div class="col-lg-6 fv-row fv-plugins-icon-container">
                         <div class="mb-3">
@@ -78,13 +80,9 @@
 {
     private UserDataModel Model = new();
     
-    [CascadingParameter]
-    public User CurrentUser { get; set; }
-
-
     private Task Load(LazyLoader loader)
     {
-        Model = Mapper.Map<UserDataModel>(CurrentUser);
+        Model = Mapper.Map<UserDataModel>(IdentityService.User);
         
         return Task.CompletedTask;
     }
@@ -98,15 +96,15 @@
             .Get()
             .FirstOrDefault(x => x.Email == Model.Email);
 
-        if (userWithThatEmail != null && CurrentUser.Id != userWithThatEmail.Id)
+        if (userWithThatEmail != null && IdentityService.User.Id != userWithThatEmail.Id)
         {
             Logger.Warn($"A user tried to lock another user out by changing the email. Email: {Model.Email}", "security");
             throw new DisplayException("A user with that email does already exist");
         }
         
-        CurrentUser = Mapper.Map(CurrentUser, Model);
+        var user = Mapper.Map(IdentityService.User, Model);
 
-        UserRepository.Update(CurrentUser);
+        UserRepository.Update(user);
         
         return Task.CompletedTask;
     }
diff --git a/Moonlight/Shared/Views/Profile/Security.razor b/Moonlight/Shared/Views/Profile/Security.razor
index 9282259a..2791c608 100644
--- a/Moonlight/Shared/Views/Profile/Security.razor
+++ b/Moonlight/Shared/Views/Profile/Security.razor
@@ -8,6 +8,7 @@
 @using Mappy.Net
 @using Moonlight.App.Models.Forms
 @using Moonlight.App.Repositories
+@using Moonlight.App.Services.Sessions
 
 @inject TotpService TotpService
 @inject UserService UserService
@@ -15,6 +16,7 @@
 @inject ModalService ModalService
 @inject Repository<User> UserRepository
 @inject SmartTranslateService SmartTranslateService
+@inject IdentityService IdentityService
 
 <ProfileNavigation Index="2"/>
 
@@ -31,7 +33,7 @@
                     <TL>2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login.</TL>
                 </p>
                 <div class="d-flex justify-content-center">
-                    @if (User.TotpEnabled)
+                    @if (IdentityService.User.TotpEnabled)
                     {
                         <WButton Text="@(SmartTranslateService.Translate("Disable"))"
                                  WorkingText=""
@@ -110,9 +112,9 @@
                 </h2>
             </div>
             <div class="modal-body fs-6">
-                @if (!User.TotpEnabled)
+                @if (!IdentityService.User.TotpEnabled)
                 {
-                    if (string.IsNullOrEmpty(User.TotpSecret))
+                    if (string.IsNullOrEmpty(IdentityService.User.TotpSecret))
                     {
                         <p>
                             <TL>Make sure you have installed one of the following apps on your smartphone and press continue</TL>
@@ -147,7 +149,7 @@
 
                                 var qrCodeData = qrGenerator.CreateQrCode
                                     (
-                                        $"otpauth://totp/{Uri.EscapeDataString(User.Email)}?secret={User.TotpSecret}&issuer={Uri.EscapeDataString("Moonlight")}",
+                                        $"otpauth://totp/{Uri.EscapeDataString(IdentityService.User.Email)}?secret={IdentityService.User.TotpSecret}&issuer={Uri.EscapeDataString("Moonlight")}",
                                         QRCodeGenerator.ECCLevel.Q
                                     );
 
@@ -179,8 +181,7 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     private string TwoFactorCode = "";
     private string Password = "";
@@ -188,7 +189,7 @@
 
     protected override void OnParametersSet()
     {
-        UserModel = Mapper.Map<UserPreferencesDataModel>(User);
+        UserModel = Mapper.Map<UserPreferencesDataModel>(IdentityService.User);
     }
 
     private async Task StartTwoFactorWizard()
@@ -219,14 +220,14 @@
 
     private async Task ChangePassword()
     {
-        await UserService.ChangePassword(User, Password);
+        await UserService.ChangePassword(IdentityService.User, Password);
         NavigationManager.NavigateTo(NavigationManager.Uri, true);
     }
 
     private async Task SavePreferences()
     {
-        User = Mapper.Map(User, UserModel);
-        UserRepository.Update(User);
+        var user = Mapper.Map(IdentityService.User, UserModel);
+        UserRepository.Update(user);
         await InvokeAsync(StateHasChanged);
         NavigationManager.NavigateTo(NavigationManager.Uri, true);
     }
diff --git a/Moonlight/Shared/Views/Profile/Subscriptions/Index.razor b/Moonlight/Shared/Views/Profile/Subscriptions/Index.razor
index 678f0230..a0475d92 100644
--- a/Moonlight/Shared/Views/Profile/Subscriptions/Index.razor
+++ b/Moonlight/Shared/Views/Profile/Subscriptions/Index.razor
@@ -7,6 +7,7 @@
 @using Moonlight.App.Repositories
 @using Moonlight.App.Services.Interop
 @using Markdig
+@using Moonlight.App.Services.Sessions
 
 @inject BillingService BillingService
 @inject Repository<Subscription> SubscriptionRepository
@@ -14,6 +15,7 @@
 @inject PopupService PopupService
 @inject SubscriptionService SubscriptionService
 @inject SmartTranslateService SmartTranslateService
+@inject IdentityService IdentityService
 
 <ProfileNavigation Index="3"/>
 
@@ -80,7 +82,7 @@
     {
         <div class="card">
             <div class="card-body">
-                @if ((User.SubscriptionExpires - DateTime.UtcNow).TotalDays < 5)
+                @if ((IdentityService.User.SubscriptionExpires - DateTime.UtcNow).TotalDays < 5)
                 {
                     <div class="notice d-flex bg-light-warning rounded border-warning border mb-12 p-6">
                         <div class="d-flex flex-stack flex-grow-1 ">
@@ -91,7 +93,7 @@
                                 <div class="fs-6 text-gray-700 ">
                                     <TL>Your subscription expires soon</TL>
                                     <span>
-                                        @(Math.Round((User.SubscriptionExpires - DateTime.UtcNow).TotalDays)) <TL>left</TL>
+                                        @(Math.Round((IdentityService.User.SubscriptionExpires - DateTime.UtcNow).TotalDays)) <TL>left</TL>
                                     </span>
                                 </div>
                             </div>
@@ -101,7 +103,7 @@
                 <div class="row">
                     <div class="col-lg-7">
                         <h3 class="mb-2">
-                            <TL>Active until</TL> @(Formatter.FormatDateOnly(User.SubscriptionExpires))
+                            <TL>Active until</TL> @(Formatter.FormatDateOnly(IdentityService.User.SubscriptionExpires))
                         </h3>
                         <p class="fs-6 text-gray-600 fw-semibold mb-6 mb-lg-15">
                             <TL>We will send you a email upon subscription expiration</TL>
@@ -134,8 +136,7 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     private Subscription[] Subscriptions;
     private Subscription? CurrentSubscription;
@@ -144,21 +145,21 @@
     private async Task Load(LazyLoader lazyLoader)
     {
         Subscriptions = SubscriptionRepository.Get().ToArray();
-        CurrentSubscription = await SubscriptionService.GetActiveSubscription(User);
+        CurrentSubscription = await SubscriptionService.GetActiveSubscription(IdentityService.User);
     }
 
     private async Task Cancel()
     {
         if (await AlertService.ConfirmMath())
         {
-            await SubscriptionService.CancelSubscription(User);
+            await SubscriptionService.CancelSubscription(IdentityService.User);
             await LazyLoader.Reload();
         }
     }
 
     private async Task StartCheckout(Subscription subscription)
     {
-        var url = await BillingService.StartCheckout(User, subscription);
+        var url = await BillingService.StartCheckout(IdentityService.User, subscription);
 
         await PopupService.ShowCentered(
             url,
diff --git a/Moonlight/Shared/Views/Server/Index.razor b/Moonlight/Shared/Views/Server/Index.razor
index 3b7cabf3..d91238e8 100644
--- a/Moonlight/Shared/Views/Server/Index.razor
+++ b/Moonlight/Shared/Views/Server/Index.razor
@@ -20,6 +20,7 @@
 @inject NavigationManager NavigationManager
 @inject DynamicBackgroundService DynamicBackgroundService
 @inject SmartTranslateService SmartTranslateService
+@inject IdentityService IdentityService
 
 @implements IDisposable
 
@@ -143,8 +144,7 @@
     [Parameter]
     public string ServerUuid { get; set; }
 
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     [Parameter]
     public string? Route { get; set; }
@@ -209,7 +209,7 @@
 
         if (CurrentServer != null)
         {
-            if (CurrentServer.Owner.Id != User!.Id && !User.Admin)
+            if (CurrentServer.Owner.Id != IdentityService.User.Id && !IdentityService.User.Admin)
                 CurrentServer = null;
         }
 
diff --git a/Moonlight/Shared/Views/Server/ServerFiles.razor b/Moonlight/Shared/Views/Server/ServerFiles.razor
index 9ce54cd2..0452d908 100644
--- a/Moonlight/Shared/Views/Server/ServerFiles.razor
+++ b/Moonlight/Shared/Views/Server/ServerFiles.razor
@@ -5,10 +5,12 @@
 @using Moonlight.App.Services
 @using Moonlight.App.ApiClients.Wings
 @using Moonlight.App.Helpers.Wings
+@using Moonlight.App.Services.Sessions
 
 @inject WingsApiHelper WingsApiHelper
 @inject WingsJwtHelper WingsJwtHelper
 @inject ConfigService ConfigService
+@inject IdentityService IdentityService
 
 <FileManager Access="FileAccess"></FileManager>
 
@@ -17,13 +19,10 @@
     [CascadingParameter]
     public Server CurrentServer { get; set; }
     
-    [CascadingParameter]
-    public User User { get; set; }
-
     private FileAccess FileAccess;
 
     protected override void OnInitialized()
     {
-        FileAccess = new WingsFileAccess(WingsApiHelper, WingsJwtHelper, CurrentServer, ConfigService, User);
+        FileAccess = new WingsFileAccess(WingsApiHelper, WingsJwtHelper, CurrentServer, ConfigService, IdentityService.User);
     }
 }
diff --git a/Moonlight/Shared/Views/Server/ServerNavigation.razor b/Moonlight/Shared/Views/Server/ServerNavigation.razor
index 778aefa5..7f84ce7c 100644
--- a/Moonlight/Shared/Views/Server/ServerNavigation.razor
+++ b/Moonlight/Shared/Views/Server/ServerNavigation.razor
@@ -3,8 +3,10 @@
 @using Moonlight.App.Helpers
 @using Moonlight.App.Helpers.Wings
 @using Moonlight.App.Helpers.Wings.Enums
+@using Moonlight.App.Services.Sessions
 
 @inject SmartTranslateService TranslationService
+@inject IdentityService IdentityService
 
 <div class="align-items-center">
     <div class="row">
@@ -53,12 +55,12 @@
                 <div class="row align-items-center">
                     <div class="col fs-5">
                         <span class="fw-bold"><TL>Shared IP</TL>:</span>
-                        <span class="ms-1 text-muted @(User.StreamerMode ? "blur" : "")">@($"{CurrentServer.Node.Fqdn}:{CurrentServer.MainAllocation?.Port ?? 0}")</span>
+                        <span class="ms-1 text-muted @(IdentityService.User.StreamerMode ? "blur" : "")">@($"{CurrentServer.Node.Fqdn}:{CurrentServer.MainAllocation?.Port ?? 0}")</span>
                     </div>
                     <div class="col fs-5">
                         <span class="fw-bold"><TL>Server ID</TL>:</span>
                         <span class="ms-1 text-muted">
-                            @if (User.Admin)
+                            @if (IdentityService.User.Admin)
                             {
                                 <a href="/admin/servers/view/@(CurrentServer.Id)">@(CurrentServer.Id)</a>
                             }
@@ -196,8 +198,7 @@
     [CascadingParameter]
     public Server CurrentServer { get; set; }
 
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     [CascadingParameter]
     public WingsConsole Console { get; set; }
diff --git a/Moonlight/Shared/Views/Servers/Create.razor b/Moonlight/Shared/Views/Servers/Create.razor
index 00e4d3d4..84e786c8 100644
--- a/Moonlight/Shared/Views/Servers/Create.razor
+++ b/Moonlight/Shared/Views/Servers/Create.razor
@@ -7,6 +7,7 @@
 @using Moonlight.App.Repositories.Servers
 @using Microsoft.EntityFrameworkCore
 @using Moonlight.App.Exceptions
+@using Moonlight.App.Services.Sessions
 
 @inject SubscriptionService SubscriptionService
 @inject ImageRepository ImageRepository
@@ -15,6 +16,7 @@
 @inject ServerRepository ServerRepository
 @inject NavigationManager NavigationManager
 @inject ServerService ServerService
+@inject IdentityService IdentityService
 
 <LazyLoader Load="Load">
     @if (DeployNode == null)
@@ -172,8 +174,7 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     private Node? DeployNode;
     private Subscription? Subscription;
@@ -190,7 +191,7 @@
         Model = new();
 
         await lazyLoader.SetText(SmartTranslateService.Translate("Loading your subscription"));
-        Subscription = await SubscriptionService.GetActiveSubscription(User);
+        Subscription = await SubscriptionService.GetActiveSubscription(IdentityService.User);
 
         await lazyLoader.SetText(SmartTranslateService.Translate("Searching for deploy node"));
         DeployNode = await SmartDeployService.GetNode();
@@ -200,7 +201,7 @@
 
         foreach (var image in images)
         {
-            var limit = await SubscriptionService.GetLimit(User, "image." + image.Id);
+            var limit = await SubscriptionService.GetLimit(IdentityService.User, "image." + image.Id);
 
             if (limit.Amount > 0)
             {
@@ -208,7 +209,7 @@
                     .Get()
                     .Include(x => x.Owner)
                     .Include(x => x.Image)
-                    .Where(x => x.Owner.Id == User.Id)
+                    .Where(x => x.Owner.Id == IdentityService.User.Id)
                     .Count(x => x.Image.Id == image.Id);
 
                 Images.Add(image, limit);
@@ -219,7 +220,7 @@
 
     private async Task OnValidSubmit()
     {
-        var limit = await SubscriptionService.GetLimit(User, "image." + Model.Image.Id);
+        var limit = await SubscriptionService.GetLimit(IdentityService.User, "image." + Model.Image.Id);
 
         if (limit.Amount > 0)
         {
@@ -227,7 +228,7 @@
                 .Get()
                 .Include(x => x.Owner)
                 .Include(x => x.Image)
-                .Where(x => x.Owner.Id == User.Id)
+                .Where(x => x.Owner.Id == IdentityService.User.Id)
                 .Count(x => x.Image.Id == Model.Image.Id);
 
             if (serversCount < limit.Amount)
@@ -241,7 +242,7 @@
                         cpu,
                         memory,
                         disk,
-                        User,
+                        IdentityService.User,
                         Model.Image,
                         DeployNode
                         );
diff --git a/Moonlight/Shared/Views/Servers/Index.razor b/Moonlight/Shared/Views/Servers/Index.razor
index 4df99d73..58151551 100644
--- a/Moonlight/Shared/Views/Servers/Index.razor
+++ b/Moonlight/Shared/Views/Servers/Index.razor
@@ -5,6 +5,7 @@
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Repositories
 @using Moonlight.App.Services
+@using Moonlight.App.Services.Sessions
 @using Newtonsoft.Json
 
 @inject Repository<Server> ServerRepository
@@ -12,6 +13,7 @@
 @inject SmartTranslateService SmartTranslateService
 @inject IServiceScopeFactory ServiceScopeFactory
 @inject IJSRuntime JsRuntime
+@inject IdentityService IdentityService
 
 <LazyLoader @ref="LazyLoader" Load="Load">
     <div class="mx-auto">
@@ -119,7 +121,7 @@
                                                             <span class="card-text fs-6">
                                                                 @(Math.Round(server.Memory / 1024D, 2)) GB / @(Math.Round(server.Disk / 1024D, 2)) GB / @(server.Node.Name) <span class="text-gray-700">- @(server.Image.Name)</span>
                                                             </span>
-                                                            <div class="card-text my-1 fs-6 fw-bold @(User.StreamerMode ? "blur" : "")">
+                                                            <div class="card-text my-1 fs-6 fw-bold @(IdentityService.User.StreamerMode ? "blur" : "")">
                                                                 @(server.Node.Fqdn):@(server.MainAllocation.Port)
                                                             </div>
                                                             <div class="card-text fs-6">
@@ -186,8 +188,7 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     private Server[] AllServers;
     private LazyLoader LazyLoader;
@@ -204,12 +205,12 @@
             .Include(x => x.MainAllocation)
             .Include(x => x.Node)
             .Include(x => x.Image)
-            .Where(x => x.Owner.Id == User.Id)
+            .Where(x => x.Owner.Id == IdentityService.User.Id)
             .OrderBy(x => x.Name)
             .ToArray();
 
 
-        if (string.IsNullOrEmpty(User.ServerListLayoutJson))
+        if (string.IsNullOrEmpty(IdentityService.User.ServerListLayoutJson))
         {
             ServerGroups.Add(new()
             {
@@ -220,7 +221,7 @@
         else
         {
             ServerGroups = (JsonConvert.DeserializeObject<ServerGroup[]>(
-                User.ServerListLayoutJson) ?? Array.Empty<ServerGroup>()).ToList();
+                IdentityService.User.ServerListLayoutJson) ?? Array.Empty<ServerGroup>()).ToList();
 
             await CheckServerGroups();
         }
@@ -282,8 +283,8 @@
 
             await CheckServerGroups();
             
-            User.ServerListLayoutJson = json;
-            UserRepository.Update(User);
+            IdentityService.User.ServerListLayoutJson = json;
+            UserRepository.Update(IdentityService.User);
 
             await LazyLoader.Reload();
         }
diff --git a/Moonlight/Shared/Views/Support.razor b/Moonlight/Shared/Views/Support.razor
index e6e0cace..039def04 100644
--- a/Moonlight/Shared/Views/Support.razor
+++ b/Moonlight/Shared/Views/Support.razor
@@ -5,10 +5,12 @@
 @using Moonlight.App.Services.SupportChat
 @using System.Text.RegularExpressions
 @using Moonlight.App.Services.Files
+@using Moonlight.App.Services.Sessions
 
 @inject ResourceService ResourceService
 @inject SupportChatClientService ClientService
 @inject SmartTranslateService SmartTranslateService
+@inject IdentityService IdentityService
 
 @implements IDisposable
 
@@ -20,7 +22,7 @@
                     <div class="scroll-y me-n5 pe-5" style="max-height: 55vh; display: flex; flex-direction: column-reverse;">
                         @foreach (var message in Messages.ToArray())
                         {
-                            if (message.Sender == null || message.Sender.Id != User.Id)
+                            if (message.Sender == null || message.Sender.Id != IdentityService.User.Id)
                             {
                                 <div class="d-flex justify-content-start mb-10 ">
                                     <div class="d-flex flex-column align-items-start">
@@ -199,9 +201,6 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
-
     private List<SupportChatMessage> Messages = new();
     private string[] Typing = Array.Empty<string>();
 
diff --git a/Moonlight/Shared/Views/Webspace/Index.razor b/Moonlight/Shared/Views/Webspace/Index.razor
index 3e654e1f..1de867e0 100644
--- a/Moonlight/Shared/Views/Webspace/Index.razor
+++ b/Moonlight/Shared/Views/Webspace/Index.razor
@@ -4,10 +4,11 @@
 @using Moonlight.App.Services
 @using Moonlight.Shared.Components.WebsiteControl
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Services.Interop
+@using Moonlight.App.Services.Sessions
 
 @inject Repository<WebSpace> WebSpaceRepository
 @inject WebSpaceService WebSpaceService
+@inject IdentityService IdentityService
 
 <LazyLoader Load="Load">
     @if (CurrentWebspace == null)
@@ -97,9 +98,6 @@
     [Parameter]
     public string? Route { get; set; }
 
-    [CascadingParameter]
-    public User User { get; set; }
-
     private WebSpace? CurrentWebspace;
     private bool HostOnline = false;
 
@@ -113,7 +111,7 @@
 
         if (CurrentWebspace != null)
         {
-            if (CurrentWebspace.Owner.Id != User!.Id && !User.Admin)
+            if (CurrentWebspace.Owner.Id != IdentityService.User.Id && !IdentityService.User.Admin)
                 CurrentWebspace = null;
         }
 
diff --git a/Moonlight/Shared/Views/Webspaces/Create.razor b/Moonlight/Shared/Views/Webspaces/Create.razor
index d51a09f7..5b756541 100644
--- a/Moonlight/Shared/Views/Webspaces/Create.razor
+++ b/Moonlight/Shared/Views/Webspaces/Create.razor
@@ -4,6 +4,7 @@
 @using Moonlight.App.Models.Forms
 @using Moonlight.App.Repositories
 @using Microsoft.EntityFrameworkCore
+@using Moonlight.App.Services.Sessions
 
 @inject SubscriptionService SubscriptionService
 @inject WebSpaceService WebSpaceService
@@ -11,6 +12,7 @@
 @inject SmartDeployService SmartDeployService
 @inject SmartTranslateService SmartTranslateService
 @inject NavigationManager NavigationManager
+@inject IdentityService IdentityService
 
 <LazyLoader Load="Load">
     @if (CloudPanel == null)
@@ -110,8 +112,7 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
 
     private Subscription? Subscription;
     private CloudPanel? CloudPanel;
@@ -125,7 +126,7 @@
         Model = new();
 
         await lazyLoader.SetText(SmartTranslateService.Translate("Loading your subscription"));
-        Subscription = await SubscriptionService.GetActiveSubscription(User);
+        Subscription = await SubscriptionService.GetActiveSubscription(IdentityService.User);
 
         await lazyLoader.SetText(SmartTranslateService.Translate("Searching for deploy web host"));
         CloudPanel = await SmartDeployService.GetCloudPanel();
@@ -133,7 +134,7 @@
         AllowOrder = WebSpaceRepository
             .Get()
             .Include(x => x.Owner)
-            .Count(x => x.Owner.Id == User.Id) < (await SubscriptionService.GetLimit(User, "websites")).Amount;
+            .Count(x => x.Owner.Id == IdentityService.User.Id) < (await SubscriptionService.GetLimit(IdentityService.User, "websites")).Amount;
     }
 
     private async Task OnValidSubmit()
@@ -141,9 +142,9 @@
         if (WebSpaceRepository
             .Get()
             .Include(x => x.Owner)
-            .Count(x => x.Owner.Id == User.Id) < (await SubscriptionService.GetLimit(User, "websites")).Amount)
+            .Count(x => x.Owner.Id == IdentityService.User.Id) < (await SubscriptionService.GetLimit(IdentityService.User, "websites")).Amount)
         {
-            var webSpace = await WebSpaceService.Create(Model.BaseDomain, User, CloudPanel);
+            var webSpace = await WebSpaceService.Create(Model.BaseDomain, IdentityService.User, CloudPanel);
 
             NavigationManager.NavigateTo($"/webspace/{webSpace.Id}");
         }
diff --git a/Moonlight/Shared/Views/Webspaces/Index.razor b/Moonlight/Shared/Views/Webspaces/Index.razor
index b264ed1e..e82d9502 100644
--- a/Moonlight/Shared/Views/Webspaces/Index.razor
+++ b/Moonlight/Shared/Views/Webspaces/Index.razor
@@ -2,8 +2,10 @@
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Repositories
 @using Microsoft.EntityFrameworkCore
+@using Moonlight.App.Services.Sessions
 
 @inject Repository<WebSpace> WebSpaceRepository
+@inject IdentityService IdentityService
 
 <LazyLoader Load="Load">
     @if (WebSpaces.Any())
@@ -50,8 +52,7 @@
 
 @code
 {
-    [CascadingParameter]
-    public User User { get; set; }
+    
     
     private WebSpace[] WebSpaces;
 
@@ -61,7 +62,7 @@
             .Get()
             .Include(x => x.Owner)
             .Include(x => x.CloudPanel)
-            .Where(x => x.Owner.Id == User.Id)
+            .Where(x => x.Owner.Id == IdentityService.User.Id)
             .ToArray();
         
         return Task.CompletedTask;
diff --git a/Moonlight/_Imports.razor b/Moonlight/_Imports.razor
index 71c36c2a..c522ea8b 100644
--- a/Moonlight/_Imports.razor
+++ b/Moonlight/_Imports.razor
@@ -9,7 +9,6 @@
 @using Moonlight
 @using Moonlight.App.Perms
 @using Moonlight.Shared.Components
-@using Moonlight.Shared.Components.StateLogic
 @using Moonlight.Shared.Components.Alerts
 @using Moonlight.Shared.Components.Forms
 @using Moonlight.Shared.Components.Partials