diff --git a/src/main/java/org/highmed/numportal/properties/FeatureProperties.java b/src/main/java/org/highmed/numportal/properties/FeatureProperties.java
index a431579e..6ae9470a 100644
--- a/src/main/java/org/highmed/numportal/properties/FeatureProperties.java
+++ b/src/main/java/org/highmed/numportal/properties/FeatureProperties.java
@@ -8,6 +8,6 @@
 @ConfigurationProperties(prefix = "feature")
 public class FeatureProperties {
 
-  private boolean searchWithAql = false;
+  private boolean searchByManager = false;
 
 }
diff --git a/src/main/java/org/highmed/numportal/web/controller/ManagerController.java b/src/main/java/org/highmed/numportal/web/controller/ManagerController.java
index 671eab48..fddf39d2 100644
--- a/src/main/java/org/highmed/numportal/web/controller/ManagerController.java
+++ b/src/main/java/org/highmed/numportal/web/controller/ManagerController.java
@@ -34,7 +34,7 @@
 @AllArgsConstructor
 @RequestMapping(value = "/manager", produces = "application/json")
 @SecurityRequirement(name = "security_auth")
-@ConditionalOnProperty(value = "feature.search-with-aql", havingValue = "true")
+@ConditionalOnProperty(value = "feature.search-by-manager", havingValue = "true")
 public class ManagerController {
 
   private final EhrBaseService ehrBaseService;
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index eba0048b..a40dcd54 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -107,4 +107,4 @@ user-service:
   delete-users-cron: 0 0 5 * * *
 
 feature:
-  search-with-aql: false
\ No newline at end of file
+  search-by-manager: true
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 01017a0e..d09a3271 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -208,4 +208,4 @@ user-service:
   delete-users-cron: 0 0 5 * * *
 
 feature:
-  search-with-aql: false
\ No newline at end of file
+  search-by-manager: false
\ No newline at end of file
diff --git a/src/test/java/org/highmed/numportal/integrationtesting/tests/ManagerControllerFeatureDisabledIT.java b/src/test/java/org/highmed/numportal/integrationtesting/tests/ManagerControllerFeatureDisabledIT.java
index d180090d..cd18a742 100644
--- a/src/test/java/org/highmed/numportal/integrationtesting/tests/ManagerControllerFeatureDisabledIT.java
+++ b/src/test/java/org/highmed/numportal/integrationtesting/tests/ManagerControllerFeatureDisabledIT.java
@@ -15,7 +15,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @TestPropertySource(properties = """
-        feature.search-with-aql = false
+        feature.search-by-manager = false
         """)
 public class ManagerControllerFeatureDisabledIT extends IntegrationTest {
 
diff --git a/src/test/java/org/highmed/numportal/integrationtesting/tests/ManagerControllerIT.java b/src/test/java/org/highmed/numportal/integrationtesting/tests/ManagerControllerIT.java
index 2a87259c..6ce957da 100644
--- a/src/test/java/org/highmed/numportal/integrationtesting/tests/ManagerControllerIT.java
+++ b/src/test/java/org/highmed/numportal/integrationtesting/tests/ManagerControllerIT.java
@@ -38,7 +38,7 @@
 @AutoConfigureMockMvc
 @ActiveProfiles("itest")
 @TestPropertySource(properties = """
-        feature.search-with-aql = true
+        feature.search-by-manager = true
         """)
 public class ManagerControllerIT extends IntegrationTest {