diff --git a/app/src/Lib/Traits/IndexQueryTrait.php b/app/src/Lib/Traits/IndexQueryTrait.php
index f4f28aab9..da9432f86 100644
--- a/app/src/Lib/Traits/IndexQueryTrait.php
+++ b/app/src/Lib/Traits/IndexQueryTrait.php
@@ -228,9 +228,9 @@ public function getIndexQuery(bool $pickerMode = false, array $requestParams = [
     // Filter results that will occur from the searchable attributes
     // TODO: Move to its own function
     if($pickerMode) {
-      // Get only the active People
-      // XXX Perhaps we need to make this a configuration
-      $query = $query->where(fn(QueryExpression $exp, Query $query) => $exp->in($table->getAlias().'.status', [StatusEnum::Active, StatusEnum::GracePeriod]));
+      // XXX Deprecated in v5.2: Get only the active People
+      // XXX Make this a configuration instead:
+      // $query = $query->where(fn(QueryExpression $exp, Query $query) => $exp->in($table->getAlias().'.status', [StatusEnum::Active, StatusEnum::GracePeriod]));
 
       // Specific expressions per view
       $query = match(true) {
diff --git a/app/templates/element/peopleAutocomplete.php b/app/templates/element/peopleAutocomplete.php
index ab8204105..ce717c08c 100644
--- a/app/templates/element/peopleAutocomplete.php
+++ b/app/templates/element/peopleAutocomplete.php
@@ -130,7 +130,7 @@
             fieldName: '<?= $fieldName ?>', // This property hold the form input id
             type: '<?= $type ?>',
             personType: '<?= $personType ?>',
-            minLength: 2, // XXX probably should be set by config and default to 3
+            minLength: 3, // XXX probably should be set by config
             htmlId: '<?= $htmlId ?>', // This property holds the vuejs input id
             actionUrl: '<?= $constructedActionUrl ?>',
             inputValue: '<?= $inputValue ?>',