diff --git a/src/Services/LdapService.cs b/src/Services/LdapService.cs
index c5cb0d7..b267708 100644
--- a/src/Services/LdapService.cs
+++ b/src/Services/LdapService.cs
@@ -45,15 +45,17 @@ public partial class LdapService : IDisposable
     public string UsersBaseDn => string.IsNullOrEmpty(_opts.UsersOu) ? _opts.BaseDn : $"{_opts.UsersOu},{_opts.BaseDn}";
     public string GroupsBaseDn => string.IsNullOrEmpty(_opts.GroupsOu) ? _opts.BaseDn : $"{_opts.GroupsOu},{_opts.BaseDn}";
     public string MigrationsBaseDn => string.IsNullOrEmpty(_opts.MigrationsOu) ? _opts.BaseDn : $"{_opts.MigrationsOu},{_opts.BaseDn}";
+    public string[] UsersAttributes => ["cn", "sn", "title", "uid", "jpegPhoto", "userPassword", "description"];
+    public string[] LocationsAttributes => ["l", "street", "description"];
     public string[] GroupsAttributes => ["cn", "gidNumber", "description"];
     public async Task<IEnumerable<Dictionary<string, string>>> ListLocationsAsync()
     {
-        return await ListObjectBy(LocationsBaseDn, "(ou=locations)", ["l", "street", "description"]);
+        return await ListObjectBy(LocationsBaseDn, "", LocationsAttributes);
     }
 
     public async Task<IEnumerable<Dictionary<string, string>>> ListUsersAsync()
     {
-        return await ListObjectBy(UsersBaseDn, "", ["cn", "sn", "title", "uid", "jpegPhoto", "userPassword", "description"]);
+        return await ListObjectBy(UsersBaseDn, "", UsersAttributes);
     }
 
     public async Task<MigrationModel> GetMigrationVersionAsync()