diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 0d3a70f75b..901a0b1b07 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -35,6 +35,7 @@ use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException as LaravelValidationException;
 use League\OAuth2\Server\Exception\OAuthServerException;
+use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
 
@@ -54,6 +55,7 @@ class Handler extends ExceptionHandler
             LaravelValidationException::class,
             NotFoundHttpException::class,
             OAuthServerException::class,
+            LaravelOAuthException::class,
             TokenMismatchException::class,
         ];
 
diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php
index b67f3722ea..6610053912 100644
--- a/app/Http/Controllers/Recurring/EditController.php
+++ b/app/Http/Controllers/Recurring/EditController.php
@@ -103,7 +103,7 @@ class EditController extends Controller
         $repetition     = $recurrence->recurrenceRepetitions()->first();
         $currentRepType = $repetition->repetition_type;
         if ('' !== $repetition->repetition_moment) {
-            $currentRepType .= ',' . $repetition->repetition_moment; 
+            $currentRepType .= ',' . $repetition->repetition_moment;
         }
 
         // put previous url in session if not redirect from store (not "return_to_edit").
@@ -119,10 +119,10 @@ class EditController extends Controller
             'times'      => (string)trans('firefly.repeat_times'),
         ];
         if (null !== $recurrence->repeat_until) {
-            $repetitionEnd = 'until_date'; 
+            $repetitionEnd = 'until_date';
         }
         if ($recurrence->repetitions > 0) {
-            $repetitionEnd = 'times'; 
+            $repetitionEnd = 'times';
         }
 
         $weekendResponses = [
@@ -140,7 +140,7 @@ class EditController extends Controller
             'deposit_source_id'         => $array['transactions'][0]['source_id'],
             'withdrawal_destination_id' => $array['transactions'][0]['destination_id'],
         ];
-        $array['first_date']              = substr($array['first_date'], 0, 10);
+        $array['first_date']              = substr((string)$array['first_date'], 0, 10);
         $array['repeat_until']            = substr((string)$array['repeat_until'], 0, 10);
         $array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []);
 
@@ -177,7 +177,7 @@ class EditController extends Controller
         }
 
         if (count($this->attachments->getMessages()->get('attachments')) > 0) {
-            $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); 
+            $request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
         }
         app('preferences')->mark();
         $redirect = redirect($this->getPreviousUri('recurrences.edit.uri'));
diff --git a/app/Support/Binder/EitherConfigKey.php b/app/Support/Binder/EitherConfigKey.php
index a880ff6873..c706cba554 100644
--- a/app/Support/Binder/EitherConfigKey.php
+++ b/app/Support/Binder/EitherConfigKey.php
@@ -35,6 +35,9 @@ class EitherConfigKey
         'firefly.default_location',
         'firefly.account_to_transaction',
         'firefly.allowed_opposing_types',
+        'firefly.accountRoles',
+        'firefly.valid_liabilities',
+        'firefly.interest_periods'
     ];
     /**
      * @param string $value