diff --git a/botserver/src/directory/auth_routes.rs b/botserver/src/directory/auth_routes.rs
index 3ac8196e..09f59442 100644
--- a/botserver/src/directory/auth_routes.rs
+++ b/botserver/src/directory/auth_routes.rs
@@ -174,7 +174,7 @@ pub async fn login(
         admin_token
     };
 
-    let search_url = format!("{}/v2/users", client.api_url());
+    let search_url = format!("{}/management/v1/users/_search", client.api_url());
     let search_body = serde_json::json!({
         "queries": [{
             "emailQuery": {
@@ -228,7 +228,7 @@ pub async fn login(
         .get("result")
         .and_then(|r| r.as_array())
         .and_then(|arr| arr.first())
-        .and_then(|u| u.get("userId"))
+        .and_then(|u| u.get("id").or_else(|| u.get("userId")))
         .and_then(|v| v.as_str())
         .map(String::from);
 
diff --git a/botserver/src/directory/client.rs b/botserver/src/directory/client.rs
index a2759867..c3b15b2c 100644
--- a/botserver/src/directory/client.rs
+++ b/botserver/src/directory/client.rs
@@ -257,14 +257,15 @@ impl ZitadelClient {
     pub async fn list_users(&self, limit: u32, offset: u32) -> Result<Vec<serde_json::Value>> {
         let token = self.get_access_token().await?;
         let url = format!(
-            "{}/v2/users?limit={}&offset={}",
+            "{}/management/v1/users/_search?limit={}&offset={}",
             self.config.api_url, limit, offset
         );
 
         let response = self
             .http_client
-            .get(&url)
+            .post(&url)
             .bearer_auth(&token)
+            .json(&serde_json::json!({}))
             .send()
             .await
             .map_err(|e| anyhow!("Failed to list users: {}", e))?;
@@ -290,7 +291,7 @@ impl ZitadelClient {
 
     pub async fn search_users(&self, query: &str) -> Result<Vec<serde_json::Value>> {
         let token = self.get_access_token().await?;
-        let url = format!("{}/v2/users/_search", self.config.api_url);
+        let url = format!("{}/management/v1/users/_search", self.config.api_url);
 
         let body = serde_json::json!({
             "queries": [{