diff --git a/src/messenger/webim/install/dbinfo.php b/src/messenger/webim/install/dbinfo.php
index aaee2a3c..63769fc1 100644
--- a/src/messenger/webim/install/dbinfo.php
+++ b/src/messenger/webim/install/dbinfo.php
@@ -155,7 +155,7 @@ function create_table($id, $link)
 	global $dbtables, $memtables, $dbencoding, $mysqlprefix;
 
 	if (!isset($dbtables[$id])) {
-		show_install_err("Unknown table: $id, " . mysql_error());
+		show_install_err("Unknown table: $id, " . mysql_error($link));
 	}
 
 	$query =
@@ -173,7 +173,7 @@ function create_table($id, $link)
 		$query .= " TYPE=InnoDb";
 	}
 
-	mysql_query($query, $link) or show_install_err(' Query failed: ' . mysql_error());
+	mysql_query($query, $link) or show_install_err(' Query failed: ' . mysql_error($link));
 
 	if ($id == "${mysqlprefix}chatoperator") {
 		create_operator_("admin", "", "", "", "Administrator", "Administrator", 0, $link);
@@ -185,7 +185,7 @@ function create_table($id, $link)
 function get_tables($link)
 {
 	global $mysqldb, $errors;
-	$result = mysql_query("SHOW TABLES FROM `$mysqldb`");
+	$result = mysql_query("SHOW TABLES FROM `$mysqldb`", $link);
 	if ($result) {
 		$arr = array();
 		while ($row = mysql_fetch_array($result, MYSQL_NUM)) {
@@ -195,7 +195,7 @@ function get_tables($link)
 		return $arr;
 
 	} else {
-		$errors[] = "Cannot get tables from database. Error: " . mysql_error();
+		$errors[] = "Cannot get tables from database. Error: " . mysql_error($link);
 		return false;
 	}
 }
@@ -203,7 +203,7 @@ function get_tables($link)
 function get_columns($tablename, $link)
 {
 	global $errors;
-	$result = mysql_query("SHOW COLUMNS FROM $tablename");
+	$result = mysql_query("SHOW COLUMNS FROM $tablename", $link);
 	if ($result) {
 		$arr = array();
 		while ($row = mysql_fetch_array($result, MYSQL_NUM)) {
@@ -213,7 +213,7 @@ function get_columns($tablename, $link)
 		return $arr;
 
 	} else {
-		$errors[] = "Cannot get columns from table \"$tablename\". Error: " . mysql_error();
+		$errors[] = "Cannot get columns from table \"$tablename\". Error: " . mysql_error($link);
 		return false;
 	}
 }
diff --git a/src/messenger/webim/install/dbperform.php b/src/messenger/webim/install/dbperform.php
index 70a1a10a..fe506fc5 100644
--- a/src/messenger/webim/install/dbperform.php
+++ b/src/messenger/webim/install/dbperform.php
@@ -25,8 +25,7 @@ require_once('dbinfo.php');
 
 function runsql($query, $link)
 {
-	$res = mysql_query($query, $link)
-	or show_install_err(' Query failed: ' . mysql_error());
+	$res = mysql_query($query, $link) or show_install_err(' Query failed: ' . mysql_error($link));
 	return $res;
 }
 
@@ -36,14 +35,12 @@ $link = @mysql_connect($mysqlhost, $mysqllogin, $mysqlpass)
 		 or show_install_err('Could not connect: ' . mysql_error());
 
 if ($act == "silentcreateall") {
-	mysql_query("CREATE DATABASE $mysqldb", $link)
-	or show_install_err(' Query failed: ' . mysql_error());
+	mysql_query("CREATE DATABASE $mysqldb", $link) or show_install_err(' Query failed: ' . mysql_error($link));
 	foreach ($dbtables as $id) {
 		create_table($id, $link);
 	}
 } else if ($act == "createdb") {
-	mysql_query("CREATE DATABASE $mysqldb", $link)
-	or show_install_err(' Query failed: ' . mysql_error());
+	mysql_query("CREATE DATABASE $mysqldb", $link) or show_install_err(' Query failed: ' . mysql_error($link));
 } else {
 	mysql_select_db($mysqldb, $link)
 	or show_install_err('Could not select database');
@@ -62,8 +59,7 @@ if ($act == "silentcreateall") {
 		}
 	} else if ($act == "dt") {
 		foreach (array_keys($dbtables) as $id) {
-			mysql_query("DROP TABLE IF EXISTS $id", $link)
-			or show_install_err(' Query failed: ' . mysql_error());
+			mysql_query("DROP TABLE IF EXISTS $id", $link) or show_install_err(' Query failed: ' . mysql_error($link));
 		}
 	} else if ($act == "addcolumns") {
 		$absent = array();
diff --git a/src/messenger/webim/install/index.php b/src/messenger/webim/install/index.php
index 4e26e1e5..4d403ac3 100644
--- a/src/messenger/webim/install/index.php
+++ b/src/messenger/webim/install/index.php
@@ -63,7 +63,7 @@ function check_connection()
 			$page['done'][] = getlocal2("install.1.connected", array($ver['c']));
 			mysql_free_result($result);
 		} else {
-			$errors[] = "Version of your SQL server is unknown. Please check. Error: " . mysql_error();
+			$errors[] = "Version of your SQL server is unknown. Please check. Error: " . mysql_error($link);
 			mysql_close($link);
 			return null;
 		}
diff --git a/src/messenger/webim/libs/common.php b/src/messenger/webim/libs/common.php
index 4387f010..3794dd1b 100644
--- a/src/messenger/webim/libs/common.php
+++ b/src/messenger/webim/libs/common.php
@@ -359,14 +359,12 @@ function connect()
 
 function perform_query($query, $link)
 {
-	mysql_query($query, $link)
-	or die(' Query failed: ' . mysql_error() /*.": ".$query*/);
+	mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link) /*.": ".$query*/);
 }
 
 function select_one_row($query, $link)
 {
-	$result = mysql_query($query, $link) or die(' Query failed: ' .
-												mysql_error() . ": " . $query);
+	$result = mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link));
 	$line = mysql_fetch_array($result, MYSQL_ASSOC);
 	mysql_free_result($result);
 	return $line;
@@ -374,8 +372,7 @@ function select_one_row($query, $link)
 
 function select_multi_assoc($query, $link)
 {
-	$sqlresult = mysql_query($query, $link) or die(' Query failed: ' .
-												   mysql_error() . ": " . $query);
+	$sqlresult = mysql_query($query, $link) or die(' Query failed: '.mysql_error($link));
 
 	$result = array();
 	while ($row = mysql_fetch_array($sqlresult, MYSQL_ASSOC)) {
@@ -395,7 +392,7 @@ function db_build_select($fields, $table, $conditions, $orderandgroup)
 function db_rows_count($table, $conditions, $countfields, $link)
 {
 	$result = mysql_query(db_build_select("count(" . ($countfields ? $countfields : "*") . ")", $table, $conditions, ""), $link)
-	or die(' Count query failed: ' . mysql_error());
+	or die(' Count query failed: ' . mysql_error($link));
 	$line = mysql_fetch_array($result, MYSQL_NUM);
 	mysql_free_result($result);
 	return $line[0];
diff --git a/src/messenger/webim/operator/blocked.php b/src/messenger/webim/operator/blocked.php
index 48412814..39773bc8 100644
--- a/src/messenger/webim/operator/blocked.php
+++ b/src/messenger/webim/operator/blocked.php
@@ -47,7 +47,7 @@ if (isset($_GET['act']) && $_GET['act'] == 'del') {
 }
 
 $result = mysql_query("select banid,unix_timestamp(dtmtill) as till,address,comment from ${mysqlprefix}chatban", $link)
-or die(' Query failed: ' . mysql_error());
+		or die(' Query failed: ' . mysql_error($link));
 
 $blockedList = array();
 while ($ban = mysql_fetch_array($result, MYSQL_ASSOC)) {
diff --git a/src/messenger/webim/operator/userhistory.php b/src/messenger/webim/operator/userhistory.php
index 51745863..84e9093b 100644
--- a/src/messenger/webim/operator/userhistory.php
+++ b/src/messenger/webim/operator/userhistory.php
@@ -50,7 +50,7 @@ function threads_by_userid($userid)
 					 "from ${mysqlprefix}chatthread " .
 					 "where userid=\"$userid\" order by created DESC", $userid);
 
-	$result = mysql_query($query, $link) or die(' Query failed: ' . mysql_error() . ": " . $query);
+	$result = mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link));
 
 	$foundThreads = array();
 	while ($thread = mysql_fetch_array($result, MYSQL_ASSOC)) {