diff --git a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php
index c6c23c72ca..f04d5217c4 100644
--- a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php
@@ -80,7 +80,7 @@ class UpdateRequest extends FormRequest
             'target_date'               => 'date|nullable|after:start_date',
             'notes'                     => 'max:65000',
             'accounts'                  => 'required',
-            'accounts.*'                => 'array|required',
+            'accounts.*'                => 'array',
             'accounts.*.account_id'     => ['required', 'numeric', 'belongsToUser:accounts,id'],
             'accounts.*.current_amount' => ['numeric', 'nullable', new IsValidZeroOrMoreAmount(true)],
             'object_group_id'           => 'numeric|belongsToUser:object_groups,id',
diff --git a/app/Api/V1/Requests/System/UpdateRequest.php b/app/Api/V1/Requests/System/UpdateRequest.php
index 2f9c39af0e..00da8d03bd 100644
--- a/app/Api/V1/Requests/System/UpdateRequest.php
+++ b/app/Api/V1/Requests/System/UpdateRequest.php
@@ -37,17 +37,18 @@ class UpdateRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
+    private array $booleans = ['configuration.is_demo_site', 'configuration.single_user_mode', 'configuration.enable_exchange_rates', 'configuration.use_running_balance', 'configuration.enable_external_map', 'configuration.enable_external_rates', 'configuration.allow_webhooks',];
+    private array $integers = ['configuration.permission_update_check', 'configuration.last_update_check'];
     /**
      * Get all data from the request.
      */
     public function getAll(): array
     {
         $name = $this->route()->parameter('dynamicConfigKey');
-
-        if ('configuration.is_demo_site' === $name || 'configuration.single_user_mode' === $name) {
+        if (in_array($name, $this->booleans, true)) {
             return ['value' => $this->boolean('value')];
         }
-        if ('configuration.permission_update_check' === $name || 'configuration.last_update_check' === $name) {
+        if (in_array($name, $this->integers, true)) {
             return ['value' => $this->convertInteger('value')];
         }
 
@@ -61,13 +62,13 @@ class UpdateRequest extends FormRequest
     {
         $name = $this->route()->parameter('configName');
 
-        if ('configuration.is_demo_site' === $name || 'configuration.single_user_mode' === $name) {
+        if (in_array($name, $this->booleans, true)) {
             return ['value' => ['required', new IsBoolean()]];
         }
         if ('configuration.permission_update_check' === $name) {
             return ['value' => 'required|numeric|min:-1|max:1'];
         }
-        if ('configuration.last_update_check' === $name) {
+        if (in_array($name, $this->integers, true)) {
             return ['value' => 'required|numeric|min:464272080'];
         }