diff --git a/interface/web/mail/lib/module.conf.php b/interface/web/mail/lib/module.conf.php
index c69fe417adcadb8912cd7dcbba3f0c4652627bc9..fc81b1a9c6adb3b65d47163ceb8cc80ed5fd4862 100644
--- a/interface/web/mail/lib/module.conf.php
+++ b/interface/web/mail/lib/module.conf.php
@@ -8,6 +8,9 @@ $module['template'] 	= 'module.tpl.htm';
 $module['startpage'] 	= 'mail/mail_domain_list.php';
 $module['tab_width']    = '';
 
+$app->uses('getconf');
+$mail_config = $app->getconf->get_server_config(1,'mail');
+
 
 //**** Email accounts menu
 $items = array();
@@ -134,14 +137,11 @@ if($app->auth->get_client_limit($userid,'fetchmail') != 0)
 
 //**** Statistics menu
 $items = array();
-
 $items[] = array( 'title' 	=> 'Mailbox traffic',
 				  'target' 	=> 'content',
 				  'link'	=> 'mail/mail_user_stats.php',
 				  'html_id' => 'mail_user_stats');
 
-
-
 $module['nav'][] = array(	'title'	=> 'Statistics',
 							'open' 	=> 1,
 							'items'	=> $items);
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index baedd98166f38d385feddf4efe8117fda3376e8d..f59db12cf6ee3fabb542fd9e7d142e2c0116f76c 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -279,7 +279,11 @@ class page_action extends tform_actions {
 			$this->dataRecord['database_name'] = substr($dbname_prefix . $this->dataRecord['database_name'], 0, 64);
 			$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
 		}
-
+		
+		//* Check for duplicates
+		$tmp = $app->db->queryOneRecord("SELECT count(database_id) as dbnum FROM web_database WHERE database_name = '".$this->dataRecord['database_name']."' AND server_id = '".$this->dataRecord["server_id"]."' AND database_id != '".$this->id."'");
+		if($tmp['dbnum'] > 0) $app->tform->errorMessage .= $app->lng('database_name_error_unique').'<br />';
+		
 		parent::onBeforeUpdate();
 	}
 
@@ -316,6 +320,10 @@ class page_action extends tform_actions {
 			$this->dataRecord['database_name'] = substr($dbname_prefix . $this->dataRecord['database_name'], 0, 64);
 			$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
 		}
+		
+		//* Check for duplicates
+		$tmp = $app->db->queryOneRecord("SELECT count(database_id) as dbnum FROM web_database WHERE database_name = '".$this->dataRecord['database_name']."' AND server_id = '".$this->dataRecord["server_id"]."'");
+		if($tmp['dbnum'] > 0) $app->tform->errorMessage .= $app->tform->lng('database_name_error_unique').'<br />';
 
 		parent::onBeforeInsert();
 	}
diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php
index 973e690ec34542a3248a01b33d566a36d2775ddb..513c396aa51d1e99fa9901d343842207adc46a1b 100644
--- a/interface/web/sites/form/database.tform.php
+++ b/interface/web/sites/form/database.tform.php
@@ -80,9 +80,7 @@ $form["tabs"]['database'] = array (
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
 														'errmsg'=> 'database_name_error_empty'),
-										1 => array (	'type'	=> 'UNIQUE',
-														'errmsg'=> 'database_name_error_unique'),
-										2 => array (	'type'	=> 'REGEX',
+										1 => array (	'type'	=> 'REGEX',
 														'regex' => '/^[a-zA-Z0-9_]{2,64}$/',
 														'errmsg'=> 'database_name_error_regex'),
 									),