diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index 9fad2b15..179a0d8e 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -64,10 +64,6 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver
 	 */
 	public function connect(array &$config)
 	{
-		DibiConnection::alias($config, 'username', 'user');
-		DibiConnection::alias($config, 'password', 'pass');
-		DibiConnection::alias($config, 'host', 'hostname');
-
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
 		} elseif (empty($config['persistent'])) {
diff --git a/dibi/drivers/mssql2005.php b/dibi/drivers/mssql2005.php
index 9ffff5c2..40971b8c 100644
--- a/dibi/drivers/mssql2005.php
+++ b/dibi/drivers/mssql2005.php
@@ -65,8 +65,6 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver
 	 */
 	public function connect(array &$config)
 	{
-		DibiConnection::alias($config, 'host', 'hostname');
-
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
 		} elseif (isset($config['options'])) {
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index 23e8867b..1f58b5f9 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -77,9 +77,6 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver
 	 */
 	public function connect(array &$config)
 	{
-		DibiConnection::alias($config, 'username', 'user');
-		DibiConnection::alias($config, 'password', 'pass');
-		DibiConnection::alias($config, 'host', 'hostname');
 		DibiConnection::alias($config, 'options');
 
 		if (isset($config['resource'])) {
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index a764eaf8..234eb9ca 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -77,9 +77,6 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver
 	 */
 	public function connect(array &$config)
 	{
-		DibiConnection::alias($config, 'username', 'user');
-		DibiConnection::alias($config, 'password', 'pass');
-		DibiConnection::alias($config, 'host', 'hostname');
 		DibiConnection::alias($config, 'options');
 		DibiConnection::alias($config, 'database');
 
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index e612132a..2a9fc525 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -66,9 +66,6 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver
 	 */
 	public function connect(array &$config)
 	{
-		DibiConnection::alias($config, 'username', 'user');
-		DibiConnection::alias($config, 'password', 'pass');
-
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
 		} else {
diff --git a/dibi/drivers/oracle.php b/dibi/drivers/oracle.php
index 76d93f65..2d3b9a56 100644
--- a/dibi/drivers/oracle.php
+++ b/dibi/drivers/oracle.php
@@ -66,9 +66,6 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver
 	 */
 	public function connect(array &$config)
 	{
-		DibiConnection::alias($config, 'username', 'user');
-		DibiConnection::alias($config, 'password', 'pass');
-		DibiConnection::alias($config, 'database', 'db');
 		DibiConnection::alias($config, 'charset');
 
 		if (isset($config['resource'])) {
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index a3b6ea04..7c8b6539 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -66,8 +66,6 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver
 	 */
 	public function connect(array &$config)
 	{
-		DibiConnection::alias($config, 'username', 'user');
-		DibiConnection::alias($config, 'password', 'pass');
 		DibiConnection::alias($config, 'dsn');
 		DibiConnection::alias($config, 'resource', 'pdo');
 		DibiConnection::alias($config, 'options');
diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index 70320eec..92f4c130 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -69,6 +69,10 @@ class DibiConnection extends DibiObject
 			throw new InvalidArgumentException('Configuration must be array, string or ArrayObject.');
 		}
 
+		self::alias($config, 'username', 'user');
+		self::alias($config, 'password', 'pass');
+		self::alias($config, 'host', 'hostname');
+
 		if (!isset($config['driver'])) {
 			$config['driver'] = dibi::$defaultDriver;
 		}