diff --git a/app/Console/Commands/System/CreatesDatabase.php b/app/Console/Commands/System/CreatesDatabase.php
index 3a63396f41..e74b9c6021 100644
--- a/app/Console/Commands/System/CreatesDatabase.php
+++ b/app/Console/Commands/System/CreatesDatabase.php
@@ -38,17 +38,17 @@ class CreatesDatabase extends Command
 
     public function handle(): int
     {
-        if ('mysql' !== config('database.default')) {
-            $this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', config('database.default')));
+        if ('mysql' !== env('DB_CONNECTION')) {
+            $this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));
 
             return 0;
         }
         // try to set up a raw connection:
         $exists  = false;
-        $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', config('database.mysql.host'), config('database.mysql.port'));
+        $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST'), env('DB_PORT'));
 
-        if ('' !== config('database.mysql.unix_socket')) {
-            $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', config('database.mysql.unix_socket'));
+        if ('' !== (string) env('DB_SOCKET')) {
+            $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET'));
         }
         $this->friendlyLine(sprintf('DSN is %s', $dsn));
 
@@ -60,7 +60,7 @@ class CreatesDatabase extends Command
 
         // when it fails, display error
         try {
-            $pdo = new \PDO($dsn, config('database.mysql.username'), config('database.mysql.password'), $options);
+            $pdo = new \PDO($dsn, env('DB_USERNAME'), env('DB_PASSWORD'), $options);
         } catch (\PDOException $e) {
             $this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));
 
@@ -74,19 +74,19 @@ class CreatesDatabase extends Command
         // slightly more complex but less error-prone.
         foreach ($stmt as $row) {
             $name = $row['Database'] ?? false;
-            if ($name === config('database.mysql.database')) {
+            if ($name === env('DB_DATABASE')) {
                 $exists = true;
             }
         }
         if (false === $exists) {
-            $this->friendlyError(sprintf('Database "%s" does not exist.', config('database.mysql.database')));
+            $this->friendlyError(sprintf('Database "%s" does not exist.', env('DB_DATABASE')));
 
             // try to create it.
-            $pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', config('database.mysql.database')));
-            $this->friendlyInfo(sprintf('Created database "%s"', config('database.mysql.database')));
+            $pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', env('DB_DATABASE')));
+            $this->friendlyInfo(sprintf('Created database "%s"', env('DB_DATABASE')));
         }
         if (true === $exists) {
-            $this->friendlyInfo(sprintf('Database "%s" exists.', config('database.mysql.database')));
+            $this->friendlyInfo(sprintf('Database "%s" exists.', env('DB_DATABASE')));
         }
 
         return 0;
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 59eda8067c..cb2769a439 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -820,7 +820,7 @@ class FireflyValidator extends Validator
         }
         $query->where('piggy_banks.name', $value);
 
-        return 0 === $query->count('piggy_banks.*');
+        return 0 === $query->count();
     }
 
     /**