diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index df16cbe962..8ed45bfa59 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -1385,7 +1385,8 @@ class egw_db
 
 		// if name contains special characters, quote it
 		// always quote for postgreSQL, as this is the only way to support mixed case names
-		if ( preg_match('/\W/', $name) || $this->Type == 'ppsql') {
+		if (preg_match('/\W/', $name) || $this->Type == 'pgsql' && preg_match('/[A-Z]+/', $name))
+		{
 			return $quote . $name . $quote;
 		}