diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
index bc992a08..2d299f6d 100644
--- a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
+++ b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Users.Enums;
 using BotSharp.Abstraction.Users.Models;
 using System.IO;
 
@@ -24,6 +25,7 @@ public partial class FileRepository
     {
         var userId = Guid.NewGuid().ToString();
         user.Id = userId;
+        user.Role = UserRole.Admin;
         var dir = Path.Combine(_dbSettings.FileRepository, "users", userId);
         if (!Directory.Exists(dir))
         {
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
index bb67de2c..b10b60e8 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -1,4 +1,6 @@
 using BotSharp.Abstraction.Agents.Models;
+using BotSharp.Abstraction.Repositories;
+using BotSharp.Abstraction.Users.Enums;
 
 namespace BotSharp.OpenAPI.Controllers;
 
@@ -7,11 +9,13 @@ namespace BotSharp.OpenAPI.Controllers;
 public class AgentController : ControllerBase
 {
     private readonly IAgentService _agentService;
+    private readonly IUserIdentity _user;
     private readonly IServiceProvider _services;
 
-    public AgentController(IAgentService agentService, IServiceProvider services)
+    public AgentController(IAgentService agentService, IUserIdentity user, IServiceProvider services)
     {
         _agentService = agentService;
+        _user = user;
         _services = services;
     }
 
@@ -45,6 +49,18 @@ public class AgentController : ControllerBase
             
             rule.RedirectToAgentName = found.Name;
         }
+
+        var editable = false;
+        var userService = _services.GetRequiredService<IUserService>();
+        var user = await userService.GetUser(_user.Id);
+        if (user != null && user.Role != UserRole.Admin)
+        {
+            var db = _services.GetRequiredService<IBotSharpRepository>();
+            var userAgents = db.GetAgentsByUser(user.Id);
+            editable = userAgents?.Select(x => x.Id)?.Contains(targetAgent.Id) ?? false;
+        }
+
+        targetAgent.Editable = editable || user?.Role == UserRole.Admin;
         return targetAgent;
     }
              
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
index 34095acf..cbcc9028 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Routing;
 using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json;
+using BotSharp.Abstraction.Users.Enums;
 
 namespace BotSharp.OpenAPI.Controllers;
 
@@ -38,10 +39,16 @@ public class ConversationController : ControllerBase
     [HttpPost("/conversations")]
     public async Task<PagedItems<ConversationViewModel>> GetConversations([FromBody] ConversationFilter filter)
     {
-        var service = _services.GetRequiredService<IConversationService>();
-        var conversations = await service.GetConversations(filter);
-
+        var convService = _services.GetRequiredService<IConversationService>();
         var userService = _services.GetRequiredService<IUserService>();
+        var user = await userService.GetUser(_user.Id);
+        if (user == null)
+        {
+            return new PagedItems<ConversationViewModel>();
+        }
+
+        filter.UserId = user.Role != UserRole.Admin ? user.Id : null;
+        var conversations = await convService.GetConversations(filter);
         var agentService = _services.GetRequiredService<IAgentService>();
         var list = conversations.Items
             .Select(x => ConversationViewModel.FromSession(x))
@@ -49,9 +56,8 @@ public class ConversationController : ControllerBase
 
         foreach (var item in list)
         {
-            var user = await userService.GetUser(item.User.Id);
+            user = await userService.GetUser(item.User.Id);
             item.User = UserViewModel.FromUser(user);
-
             var agent = await agentService.GetAgent(item.AgentId);
             item.AgentName = agent?.Name;
         }
@@ -116,21 +122,30 @@ public class ConversationController : ControllerBase
     }
 
     [HttpGet("/conversation/{conversationId}")]
-    public async Task<ConversationViewModel> GetConversation([FromRoute] string conversationId)
+    public async Task<ConversationViewModel?> GetConversation([FromRoute] string conversationId)
     {
         var service = _services.GetRequiredService<IConversationService>();
-        var conversations = await service.GetConversations(new ConversationFilter
-        {
-            Id = conversationId
-        });
-
         var userService = _services.GetRequiredService<IUserService>();
-        var result = ConversationViewModel.FromSession(conversations.Items.First());
+        var user = await userService.GetUser(_user.Id);
+        if (user == null)
+        {
+            return null;
+        }
 
+        var filter = new ConversationFilter
+        {
+            Id = conversationId,
+            UserId = user.Role != UserRole.Admin ? user.Id : null
+        };
+        var conversations = await service.GetConversations(filter);
+        if (conversations.Items.IsNullOrEmpty())
+        {
+            return null;
+        }
+        
+        var result = ConversationViewModel.FromSession(conversations.Items.First());
         var state = _services.GetRequiredService<IConversationStateService>();
         result.States = state.Load(conversationId, isReadOnly: true);
-
-        var user = await userService.GetUser(result.User.Id);
         result.User = UserViewModel.FromUser(user);
 
         return result;
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
index 536f5b5d..9d87a3e2 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
@@ -42,6 +42,8 @@ public class AgentViewModel
 
     public PluginDef Plugin { get; set; }
 
+    public bool Editable { get; set; }
+
     [JsonPropertyName("created_datetime")]
     public DateTime CreatedDateTime { get; set; }