diff --git a/src/PHPixie/Database/Driver/PDO/Adapter/Mysql.php b/src/PHPixie/Database/Driver/PDO/Adapter/Mysql.php
index 507c716..fa1df82 100755
--- a/src/PHPixie/Database/Driver/PDO/Adapter/Mysql.php
+++ b/src/PHPixie/Database/Driver/PDO/Adapter/Mysql.php
@@ -6,7 +6,7 @@ class Mysql extends \PHPixie\Database\Driver\PDO\Adapter
 {
     public function preparePdo($pdo)
     {
-        $pdo->exec("SET NAMES utf8");
+        $pdo->exec("SET NAMES " . $this->config->get('charset', 'utf8'));
     }
 
     public function listColumns($table)
diff --git a/src/PHPixie/Database/Driver/PDO/Adapter/Pgsql.php b/src/PHPixie/Database/Driver/PDO/Adapter/Pgsql.php
index a3b410c..53ddb86 100755
--- a/src/PHPixie/Database/Driver/PDO/Adapter/Pgsql.php
+++ b/src/PHPixie/Database/Driver/PDO/Adapter/Pgsql.php
@@ -6,7 +6,7 @@ class Pgsql extends \PHPixie\Database\Driver\PDO\Adapter
 {
     public function preparePdo($pdo)
     {
-        $pdo->exec("SET NAMES 'utf8'");
+        $pdo->exec("SET NAMES '" . $this->config->get('charset', 'utf8') . "'");
     }
 
     public function insertId()