diff --git a/setup/inc/class.schema_proc_pgsql.inc.php b/setup/inc/class.schema_proc_pgsql.inc.php
index 08683771d7..6f2fa00a44 100644
--- a/setup/inc/class.schema_proc_pgsql.inc.php
+++ b/setup/inc/class.schema_proc_pgsql.inc.php
@@ -387,7 +387,7 @@
 							case 'text':
 							case 'timestamp':
 							case 'varchar':
-								$sSQL .= "'" . $oProc->m_odb->f($i) . "'";
+								$sSQL .= "'" . $oProc->m_odb->db_addslashes($oProc->m_odb->f($i)) . "'";
 								break;
 							default:
 								$sSQL .= $oProc->m_odb->f($i);
diff --git a/setup/inc/class.setup_detection.inc.php b/setup/inc/class.setup_detection.inc.php
index 5d614aeb9b..1f7cb9d25d 100755
--- a/setup/inc/class.setup_detection.inc.php
+++ b/setup/inc/class.setup_detection.inc.php
@@ -27,7 +27,7 @@
 					$f = PHPGW_SERVER_ROOT . '/' . $entry . '/setup/setup.inc.php';
 					if (@file_exists ($f))
 					{
-						@include($f);
+						include($f);
 						$setup_info[$entry]['filename'] = $f;
 					}
 				}