diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php
index 691baae90a..9dd4649425 100644
--- a/core/domains/domain_edit.php
+++ b/core/domains/domain_edit.php
@@ -38,6 +38,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -123,7 +126,6 @@
 					$sql = "select count(*) from v_domains ";
 					$sql .= "where lower(domain_name) = :domain_name ";
 					$parameters['domain_name'] = $domain_name;
-					$database = new database;
 					$num_rows = $database->select($sql, $parameters, 'column');
 					unset($sql, $parameters);
 
@@ -143,7 +145,6 @@
 							$domain_array = $array;
 
 						//add the new domain
-							$database = new database;
 							$database->app_name = 'domains';
 							$database->app_uuid = '8b91605b-f6d2-42e6-a56d-5d1ded01bb44';
 							$database->save($array);
@@ -192,7 +193,6 @@
 						$sql = "select domain_name from v_domains ";
 						$sql .= "where domain_uuid = :domain_uuid ";
 						$parameters['domain_uuid'] = $domain_uuid;
-						$database = new database;
 						$original_domain_name = $database->select($sql, $parameters, 'column');
 						unset($sql, $parameters);
 
@@ -201,7 +201,6 @@
 						$array['domains'][0]['domain_name'] = $domain_name;
 						$array['domains'][0]['domain_enabled'] = $domain_enabled;
 						$array['domains'][0]['domain_description'] = $domain_description;
-						$database = new database;
 						$database->app_name = 'domains';
 						$database->app_uuid = '8b91605b-f6d2-42e6-a56d-5d1ded01bb44';
 						$database->save($array);
@@ -233,7 +232,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 
@@ -243,7 +241,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -256,7 +253,6 @@
 								$parameters['destination_data_old'] = $original_domain_name;
 								$parameters['destination_data_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -271,7 +267,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -286,7 +281,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 
@@ -296,7 +290,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -311,7 +304,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -325,7 +317,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 
@@ -336,7 +327,6 @@
 								$parameters['context_old'] = $original_domain_name;
 								$parameters['context_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -350,7 +340,6 @@
 								$parameters['type_value_old'] = $original_domain_name;
 								$parameters['type_value_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -363,7 +352,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -376,7 +364,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -389,7 +376,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -402,7 +388,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -417,7 +402,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -434,7 +418,6 @@
 								$parameters['domain_name_old'] = $original_domain_name;
 								$parameters['domain_name_new'] = $domain_name;
 								$parameters['domain_uuid'] = $domain_uuid;
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -514,7 +497,6 @@
 								$sql .= "var_value = :var_value ";
 								$sql .= "where var_name = 'domain' ";
 								$parameters['var_value'] = $domain_name;
-								$database = new database;
 								$database->app_name = 'domains';
 								$database->app_uuid = '8b91605b-f6d2-42e6-a56d-5d1ded01bb44';
 								$database->execute($sql, $parameters);
@@ -560,7 +542,6 @@
 		$sql .= "from v_domains ";
 		$sql .= "where domain_uuid = :domain_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && sizeof($row) != 0) {
 			$domain_name = strtolower($row["domain_name"]);