diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index 915fd44d..d6ef858b 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -14,6 +14,7 @@ using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 using Oqtane.Extensions;
+using Oqtane.Managers;
 
 namespace Oqtane.Controllers
 {
diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
index e8daf17b..73c5d9dd 100644
--- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -19,6 +19,7 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
 using Oqtane.Infrastructure;
+using Oqtane.Managers;
 using Oqtane.Models;
 using Oqtane.Modules;
 using Oqtane.Repository;
diff --git a/Oqtane.Server/Infrastructure/Interfaces/IUserManager.cs b/Oqtane.Server/Managers/Interfaces/IUserManager.cs
similarity index 96%
rename from Oqtane.Server/Infrastructure/Interfaces/IUserManager.cs
rename to Oqtane.Server/Managers/Interfaces/IUserManager.cs
index ff932a8f..ec58c091 100644
--- a/Oqtane.Server/Infrastructure/Interfaces/IUserManager.cs
+++ b/Oqtane.Server/Managers/Interfaces/IUserManager.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Oqtane.Models;
 
-namespace Oqtane.Infrastructure
+namespace Oqtane.Managers
 {
     public interface IUserManager
     {
diff --git a/Oqtane.Server/Infrastructure/UserManager.cs b/Oqtane.Server/Managers/UserManager.cs
similarity index 99%
rename from Oqtane.Server/Infrastructure/UserManager.cs
rename to Oqtane.Server/Managers/UserManager.cs
index e23cd12d..92677c78 100644
--- a/Oqtane.Server/Infrastructure/UserManager.cs
+++ b/Oqtane.Server/Managers/UserManager.cs
@@ -4,16 +4,14 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
 using Oqtane.Enums;
+using Oqtane.Infrastructure;
 using Oqtane.Models;
-using Oqtane.Modules.Admin.Roles;
 using Oqtane.Repository;
 using Oqtane.Shared;
 
-namespace Oqtane.Infrastructure
+namespace Oqtane.Managers
 {
     public class UserManager : IUserManager
     {