diff --git a/customer_mysql.php b/customer_mysql.php
index 0db3e057..24c56ab1 100644
--- a/customer_mysql.php
+++ b/customer_mysql.php
@@ -61,6 +61,10 @@ if ($page == 'overview') {
 		$count = 0;
 		$mysqls = '';
 
+		$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
+		$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+		$count_mysqlservers = $dbserver['numservers'];
+
 		// Begin root-session
 		Database::needRoot(true);
 		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
@@ -82,6 +86,7 @@ if ($page == 'overview') {
 		// End root-session
 
 		eval("echo \"" . getTemplate('mysql/mysqls') . "\";");
+
 	} elseif($action == 'delete' && $id != 0) {
 		$result_stmt = Database::prepare('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '`
 			WHERE `customerid`="' . (int)$userinfo['customerid'] . '"
@@ -91,13 +96,19 @@ if ($page == 'overview') {
 		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		if (isset($result['databasename']) && $result['databasename'] != '') {
+
+			Database::needRoot(true, $result['dbserver']);
+			Database::needSqlData();
+			$sql_root = Database::getSqlData();
+			Database::needRoot(false);
+
 			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
 				$result['dbserver'] = 0;
 			}
 
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				// Begin root-session
-				Database::needRoot(true);
+				Database::needRoot(true, $result['dbserver']);
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'");
 				if (Database::getAttribute(PDO::ATTR_SERVER_VERSION) < '5.0.2') {
 					// Revoke privileges (only required for MySQL 4.1.2 - 5.0.1)
@@ -137,7 +148,7 @@ if ($page == 'overview') {
 				);
 				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
 
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
 				$dbnamedesc = $result['databasename'];
 				if (isset($result['description']) && $result['description'] != '') {
@@ -161,9 +172,16 @@ if ($page == 'overview') {
 					standard_error(array('stringisempty', 'mypassword'));
 				} else {
 					$dbserver = 0;
-					if (count($sql_root) > 1) {
+					$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
+					$_dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+					$count_mysqlservers = $_dbserver['numservers'];
+					if ($count_mysqlservers > 1) {
 						$dbserver = validate($_POST['mysql_server'], html_entity_decode($lng['mysql']['mysql_server']), '', '', 0);
-						if (!isset($sql_root[$dbserver]) || !is_array($sql_root[$dbserver])) {
+						Database::needRoot(true, $dbserver);
+						Database::needSqlData();
+						$sql_root = Database::getSqlData();
+						Database::needRoot(false);
+						if (!isset($sql_root) || !is_array($sql_root)) {
 							$dbserver = 0;
 						}
 					}
@@ -231,13 +249,18 @@ if ($page == 'overview') {
 							$pma = $settings['panel']['phpmyadmin_url'];
 						}
 
+						Database::needRoot(true, $dbserver);
+						Database::needSqlData();
+						$sql_root = Database::getSqlData();
+						Database::needRoot(false);
+
 						$replace_arr = array(
 							'SALUTATION' => getCorrectUserSalutation($userinfo),
 							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
 							'DB_NAME' => $username,
 							'DB_PASS' => $password,
 							'DB_DESC' => $databasedescription,
-							'DB_SRV' => $sql_root[$dbserver]['host'],
+							'DB_SRV' => $sql_root['caption'],
 							'PMA_URI' => $pma
 						);
 
@@ -288,13 +311,18 @@ if ($page == 'overview') {
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
 			} else {
+
+				$dbservers_stmt = Database::query("SELECT DISTINCT `dbserver` FROM `".TABLE_PANEL_DATABASES."`");
 				$mysql_servers = '';
-
-				foreach ($sql_root as $mysql_server => $mysql_server_details) {
-					$mysql_servers .= makeoption($mysql_server_details['caption'], $mysql_server);
+				$count_mysqlservers = 0;
+				while ($dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC)) {
+					Database::needRoot(true, $dbserver['dbserver']);
+					Database::needSqlData();
+					$sql_root = Database::getSqlData();
+					$mysql_servers .= makeoption($sql_root['caption'], $dbserver['dbserver']);
+					$count_mysqlservers++;
 				}
-
-				//$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
+				Database::needRoot(false);
 
 				$mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php';
 				$mysql_add_form = htmlform::genHTMLForm($mysql_add_data);
@@ -354,6 +382,16 @@ if ($page == 'overview') {
 				Database::pexecute($stmt, array("desc" => $databasedescription, "customerid" => $userinfo['customerid'], "id" => $id));
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			} else {
+
+				$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
+				$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+				$count_mysqlservers = $dbserver['numservers'];
+
+				Database::needRoot(true, $result['dbserver']);
+				Database::needSqlData();
+				$sql_root = Database::getSqlData();
+				Database::needRoot(false);
+
 				$mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php';
 				$mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data);
 
diff --git a/lib/classes/database/class.Database.php b/lib/classes/database/class.Database.php
index a5362883..71cf51ce 100644
--- a/lib/classes/database/class.Database.php
+++ b/lib/classes/database/class.Database.php
@@ -231,10 +231,12 @@ class Database {
 
 		// either root or unprivileged user
 		if (self::$_needroot) {
+			$caption = $sql_root[self::$_dbserver]['caption'];
 			$user = $sql_root[self::$_dbserver]['user'];
 			$password = $sql_root[self::$_dbserver]['password'];
 			$host = $sql_root[self::$_dbserver]['host'];
 		} else {
+			$caption = 'localhost';
 			$user = $sql["user"];
 			$password = $sql["password"];
 			$host = $sql["host"];
@@ -246,7 +248,8 @@ class Database {
 					'user' => $user,
 					'passwd' => $password,
 					'host' => $host,
-					'db' => $sql["db"]
+					'db' => $sql["db"],
+					'caption' => $caption
 			);
 		}
 
diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php
index 3112c428..6676b960 100644
--- a/lib/formfields/customer/mysql/formfield.mysql_add.php
+++ b/lib/formfields/customer/mysql/formfield.mysql_add.php
@@ -28,7 +28,7 @@ return array(
 						'type' => 'text',
 					),
 					'mysql_server' => array(
-						'visible' => (1 < count($sql_root) ? true : false),
+						'visible' => (1 < $count_mysqlservers ? true : false),
 						'label' => $lng['mysql']['mysql_server'],
 						'type' => 'select',
 						'select_var' => $mysql_servers,
diff --git a/lib/formfields/customer/mysql/formfield.mysql_edit.php b/lib/formfields/customer/mysql/formfield.mysql_edit.php
index 2a579047..6f5b3189 100644
--- a/lib/formfields/customer/mysql/formfield.mysql_edit.php
+++ b/lib/formfields/customer/mysql/formfield.mysql_edit.php
@@ -34,10 +34,10 @@ return array(
 						'value' => $result['description'],
 					),
 					'mysql_server' => array(
-						'visible' => (1 < count($sql_root) ? true : false),
+						'visible' => (1 < $count_mysqlservers ? true : false),
 						'label' => $lng['mysql']['mysql_server'],
 						'type' => 'label',
-						'value' => $sql_root[$result['dbserver']]['caption']
+						'value' => $sql_root['caption']
 					),
 					'mysql_password' => array(
 						'label' => $lng['changepassword']['new_password_ifnotempty'],
diff --git a/templates/Froxlor/customer/mysql/mysqls.tpl b/templates/Froxlor/customer/mysql/mysqls.tpl
index 023491f7..8fc1282d 100644
--- a/templates/Froxlor/customer/mysql/mysqls.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls.tpl
@@ -28,7 +28,7 @@
 						<th>{$lng['mysql']['databasename']}&nbsp;{$arrowcode['databasename']}</th>
 						<th>{$lng['mysql']['databasedescription']}&nbsp;{$arrowcode['description']}</th>
 						<th>{$lng['mysql']['size']}</th>
-						<if 1 < count($sql_root)><th>{$lng['mysql']['mysql_server']}</th></if>
+						<if 1 < $count_mysqlservers><th>{$lng['mysql']['mysql_server']}</th></if>
 						<th>{$lng['panel']['options']}</th>
 					</tr>
 				</thead>
diff --git a/templates/Froxlor/customer/mysql/mysqls_database.tpl b/templates/Froxlor/customer/mysql/mysqls_database.tpl
index e2d94c57..406f3778 100644
--- a/templates/Froxlor/customer/mysql/mysqls_database.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls_database.tpl
@@ -2,7 +2,7 @@
 	<td>{$row['databasename']}</td>
 	<td>{$row['description']}</td>
 	<td>{$row['size']}</td>
-	<if 1 < count($sql_root)><td>{$sql_root['host']}</td></if>
+	<if 1 < $count_mysqlservers><td>{$sql_root['caption']}</td></if>
 	<if $row['apsdb'] != '1'>
 		<td>
 			<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
diff --git a/templates/Sparkle/customer/mysql/mysqls.tpl b/templates/Sparkle/customer/mysql/mysqls.tpl
index 869c2e42..c94ac79b 100644
--- a/templates/Sparkle/customer/mysql/mysqls.tpl
+++ b/templates/Sparkle/customer/mysql/mysqls.tpl
@@ -28,7 +28,7 @@
 						<th>{$lng['mysql']['databasename']}&nbsp;{$arrowcode['databasename']}</th>
 						<th>{$lng['mysql']['databasedescription']}&nbsp;{$arrowcode['description']}</th>
 						<th>{$lng['mysql']['size']}</th>
-						<if 1 < count($sql_root)><th>{$lng['mysql']['mysql_server']}</th></if>
+						<if 1 < $count_mysqlservers><th>{$lng['mysql']['mysql_server']}</th></if>
 						<th>{$lng['panel']['options']}</th>
 					</tr>
 				</thead>
diff --git a/templates/Sparkle/customer/mysql/mysqls_database.tpl b/templates/Sparkle/customer/mysql/mysqls_database.tpl
index e2d94c57..406f3778 100644
--- a/templates/Sparkle/customer/mysql/mysqls_database.tpl
+++ b/templates/Sparkle/customer/mysql/mysqls_database.tpl
@@ -2,7 +2,7 @@
 	<td>{$row['databasename']}</td>
 	<td>{$row['description']}</td>
 	<td>{$row['size']}</td>
-	<if 1 < count($sql_root)><td>{$sql_root['host']}</td></if>
+	<if 1 < $count_mysqlservers><td>{$sql_root['caption']}</td></if>
 	<if $row['apsdb'] != '1'>
 		<td>
 			<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">