diff --git a/CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs b/CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs
index afa3d0a..9f46f18 100644
--- a/CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs
+++ b/CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQueryHandler.cs
@@ -33,7 +33,7 @@ public sealed class GetAllTenantsQueryHandler :
         var tenantsQuery = _tenantRepository
             .GetAllNoTracking()
             .IgnoreQueryFilters()
-            .Include(x => x.Users)
+            .Include(x => x.Users.Where(y => request.IncludeDeleted || !y.Deleted))
             .Where(x => request.IncludeDeleted || !x.Deleted);
 
         if (!string.IsNullOrWhiteSpace(request.SearchTerm))
diff --git a/CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs b/CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs
index 4473ae0..ddc25bf 100644
--- a/CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs
+++ b/CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs
@@ -23,8 +23,7 @@ public sealed class GetTenantByIdQueryHandler :
 
     public async Task<TenantViewModel?> Handle(GetTenantByIdQuery request, CancellationToken cancellationToken)
     {
-        var tenant = await _tenantRepository
-            .GetByIdAsync(request.TenantId);
+        var tenant = await _tenantRepository.GetByIdAsync(request.TenantId);
 
         if (tenant is null)
         {
diff --git a/CleanArchitecture.Domain/Commands/Users/LoginUser/LoginUserCommandHandler.cs b/CleanArchitecture.Domain/Commands/Users/LoginUser/LoginUserCommandHandler.cs
index 2a72fae..118a211 100644
--- a/CleanArchitecture.Domain/Commands/Users/LoginUser/LoginUserCommandHandler.cs
+++ b/CleanArchitecture.Domain/Commands/Users/LoginUser/LoginUserCommandHandler.cs
@@ -20,7 +20,7 @@ namespace CleanArchitecture.Domain.Commands.Users.LoginUser;
 public sealed class LoginUserCommandHandler : CommandHandlerBase,
     IRequestHandler<LoginUserCommand, string>
 {
-    private const double _expiryDurationMinutes = 30;
+    private const double _expiryDurationMinutes = 60;
     private readonly TokenSettings _tokenSettings;
 
     private readonly IUserRepository _userRepository;