diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index b408f972c9..6f24586612 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -145,7 +148,6 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 			//add new uuid
 				$array['databases'][0]['database_uuid'] = uuid();
 
-				$database = new database;
 				$database->app_name = 'databases';
 				$database->app_uuid = '8d229b6d-1383-fcec-74c6-4ce1682479e2';
 				$database->save($array);
@@ -164,7 +166,6 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 			//add uuid to update
 				$array['databases'][0]['database_uuid'] = $database_uuid;
 
-				$database = new database;
 				$database->app_name = 'databases';
 				$database->app_uuid = '8d229b6d-1383-fcec-74c6-4ce1682479e2';
 				$database->save($array);
@@ -188,7 +189,6 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 		$sql = "select * from v_databases ";
 		$sql .= "where database_uuid = :database_uuid ";
 		$parameters['database_uuid'] = $database_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && sizeof($row) != 0) {
 			$database_driver = $row["database_driver"];
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 2a4f18327c..1cc3ab8aaa 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -141,7 +144,6 @@
 					//get the dialplan_uuid
 						$sql = "select dialplan_uuid from v_dialplans ";
 						$sql .= "where app_uuid = 'd49ee3bd-5085-4619-a2f9-2b62c8c461c5' ";
-						$database = new database;
 						$dialplan_uuid = $database->select($sql, null, 'column');
 						unset($sql);
 
@@ -152,7 +154,6 @@
 						$sql .= "and dialplan_detail_type = 'set' ";
 						$sql .= "and dialplan_detail_data like 'timezone=%' ";
 						$parameters['dialplan_uuid'] = $dialplan_uuid;
-						$database = new database;
 						$dialplan_detail_uuid = $database->select($sql, $parameters, 'column');
 						$detail_action = is_uuid($dialplan_detail_uuid) ? 'update' : 'add';
 						unset($sql, $parameters);
@@ -176,7 +177,6 @@
 							$p->add('dialplan_detail_add', 'temp');
 						}
 						if (is_array($array) && sizeof($array) != 0) {
-							$database = new database;
 							$database->app_name = 'default_settings';
 							$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
 							$database->save($array);
@@ -215,7 +215,6 @@
 				$array['default_settings'][$x]['default_setting_description'] = $default_setting_description;
 
 				//save to the data
-				$database = new database;
 				$database->app_name = 'default_settings';
 				$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
 				$database->save($array);
@@ -242,7 +241,6 @@
 		$sql .= "from v_default_settings ";
 		$sql .= "where default_setting_uuid = :default_setting_uuid ";
 		$parameters['default_setting_uuid'] = $default_setting_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && sizeof($row) != 0) {
 			$default_setting_category = $row["default_setting_category"];
@@ -385,7 +383,6 @@
 		echo "		<select class='formfld' id='default_setting_value' name='default_setting_value' style=''>\n";
 		$sql = "select * from v_menus ";
 		$sql .= "order by menu_language, menu_name asc ";
-		$database = new database;
 		$sub_result = $database->select($sql, null, 'all');
 		if (is_array($sub_result) && sizeof($sub_result) != 0) {
 			foreach ($sub_result as $sub_row) {
diff --git a/core/default_settings/default_setting_toggle.php b/core/default_settings/default_setting_toggle.php
index 1ae444846c..615e6e6472 100644
--- a/core/default_settings/default_setting_toggle.php
+++ b/core/default_settings/default_setting_toggle.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -53,7 +56,6 @@
 				//get current status
 					$sql = "select default_setting_enabled from v_default_settings where default_setting_uuid = :default_setting_uuid ";
 					$parameters['default_setting_uuid'] = $default_setting_uuid;
-					$database = new database;
 					$default_setting_enabled = $database->select($sql, $parameters, 'column');
 					$new_status = ($default_setting_enabled == 'true') ? 'false' : 'true';
 					unset($sql, $parameters);
@@ -61,7 +63,6 @@
 				//set new status
 					$array['default_settings'][0]['default_setting_uuid'] = $default_setting_uuid;
 					$array['default_settings'][0]['default_setting_enabled'] = $new_status;
-					$database = new database;
 					$database->app_name = 'default_settings';
 					$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
 					$database->save($array);
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index fe505d353f..237f058464 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -135,7 +138,6 @@
 							$sql .= "where domain_uuid = :domain_uuid ";
 							$sql .= "and app_uuid = '9f356fe7-8cf8-4c14-8fe2-6daf89304458' ";
 							$parameters['domain_uuid'] = $domain_uuid;
-							$database = new database;
 							$dialplan_uuid = $database->select($sql, $parameters, 'column');
 							unset($sql, $parameters);
 
@@ -148,7 +150,6 @@
 							$sql .= "and dialplan_detail_data like 'timezone=%' ";
 							$parameters['domain_uuid'] = $domain_uuid;
 							$parameters['dialplan_uuid'] = $dialplan_uuid;
-							$database = new database;
 							$dialplan_detail_uuid = $database->select($sql, $parameters, 'column');
 							$detail_action = is_uuid($dialplan_detail_uuid) ? 'update' : 'add';
 							unset($sql, $parameters);
@@ -174,7 +175,6 @@
 							}
 
 							if (!empty($array)) {
-								$database = new database;
 								$database->app_name = 'domain_settings';
 								$database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
 								$database->save($array);
@@ -188,7 +188,6 @@
 							$sql = "select domain_name from v_domains ";
 							$sql .= "where domain_uuid = :domain_uuid ";
 							$parameters['domain_uuid'] = $domain_uuid;
-							$database = new database;
 							$domain_name = $database->select($sql, $parameters, 'column');
 							unset($sql, $parameters);
 
@@ -223,7 +222,6 @@
 						$array['domain_settings'][0]['domain_setting_order'] = $domain_setting_order;
 						$array['domain_settings'][0]['domain_setting_enabled'] = $domain_setting_enabled;
 						$array['domain_settings'][0]['domain_setting_description'] = $domain_setting_description;
-						$database = new database;
 						$database->app_name = 'domain_settings';
 						$database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
 						$database->save($array);
@@ -236,7 +234,6 @@
 						$sql .= "where app_uuid = '34dd307b-fffe-4ead-990c-3d070e288126' ";
 						$sql .= "and domain_uuid = :domain_uuid ";
 						$parameters['domain_uuid'] = $_SESSION["domain_uuid"];
-						$database = new database;
 						$result = $database->select($sql, $parameters, 'all');
 						unset($sql, $parameters);
 
@@ -252,7 +249,6 @@
 									$sql .= "and domain_uuid = :domain_uuid ";
 									$parameters['dialplan_uuid'] = $dialplan_uuid;
 									$parameters['domain_uuid'] = $_SESSION["domain_uuid"];
-									$database = new database;
 									$sub_result = $database->select($sql, $parameters, 'all');
 									if (!empty($sub_result)) {
 										foreach ($sub_result as $field) {
@@ -299,7 +295,6 @@
 
 								//execute
 									if (!empty($array)) {
-										$database = new database;
 										$database->app_name = 'domain_settings';
 										$database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
 										$database->save($array);
@@ -333,7 +328,6 @@
 		$sql .= "and domain_setting_uuid = :domain_setting_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['domain_setting_uuid'] = $domain_setting_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$domain_setting_category = $row["domain_setting_category"];
@@ -469,7 +463,6 @@
 		echo "		<option value=''></option>\n";
 		$sql = "select * from v_menus ";
 		$sql .= "order by menu_language, menu_name asc ";
-		$database = new database;
 		$sub_result = $database->select($sql, null, 'all');
 		if (!empty($sub_result)) {
 			foreach ($sub_result as $sub_row) {
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 9c917180aa..4e84fbdb42 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -101,14 +104,12 @@
 	$sql = "select domain_name from v_domains ";
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$domain_name = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$sql = "select count(domain_setting_uuid) from v_domain_settings ";
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //get the list
@@ -123,7 +124,6 @@
 		$sql .= order_by($order_by, $order);
 	}
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$domain_settings = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
@@ -291,7 +291,6 @@
 				$sql = "select * from v_menus ";
 				$sql .= "where menu_uuid = :menu_uuid ";
 				$parameters['menu_uuid'] = $row['domain_setting_value'];
-				$database = new database;
 				$sub_result = $database->select($sql, $parameters, 'all');
 				if (!empty($sub_result)) {
 					foreach ($sub_result as $sub_row) {
diff --git a/core/domains/domain_json.php b/core/domains/domain_json.php
index ae6b41f593..d3faa6da27 100644
--- a/core/domains/domain_json.php
+++ b/core/domains/domain_json.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //get posted data
 	if (!empty($_POST['search'])) {
 		$search = $_POST['search'];
@@ -72,7 +75,6 @@
 			$parameters['search'] = '%'.$search.'%';
 		}
 		$sql .= "order by domain_name asc ";
-		$database = new database;
 		$domains = $database->select($sql, $parameters ?? null, 'all');
 		unset($sql, $parameters);
 	}
diff --git a/core/domains/domains.php b/core/domains/domains.php
index 132caf33ce..b065fd7ec5 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -29,6 +29,9 @@
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 
+//connect to the database
+	$database = new database;
+
 //redirect admin to app instead
 	if (file_exists($_SERVER["PROJECT_ROOT"]."/app/domains/app_config.php") && !permission_exists('domain_all') && !is_cli()) {
 		header("Location: ".PROJECT_PATH."/app/domains/domains.php");
@@ -47,7 +50,6 @@
 			//get the domain details
 				$sql = "select * from v_domains ";
 				$sql .= "order by domain_name asc ";
-				$database = new database;
 				$domains = $database->select($sql, null, 'all');
 				if (!empty($domains)) {
 					foreach($domains as $row) {
@@ -153,7 +155,6 @@
 	if (!empty($sql_search)) {
 		$sql .= "where ".$sql_search;
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -172,7 +173,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'domain_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$domains = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/groups/group_member_add.php b/core/groups/group_member_add.php
index 82025ed7af..b21269d25e 100644
--- a/core/groups/group_member_add.php
+++ b/core/groups/group_member_add.php
@@ -43,6 +43,9 @@
 		return;
 	}
 
+//connect to the database
+	$database = new database;
+
 //get the http values and set them as variables
 	$domain_uuid = $_POST["domain_uuid"];
 	$group_uuid = $_POST["group_uuid"];
@@ -68,7 +71,6 @@
 		$p = new permissions;
 		$p->add('user_group_add', 'temp');
 
-		$database = new database;
 		$database->app_name = 'groups';
 		$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
 		$database->save($array);
diff --git a/core/groups/group_members.php b/core/groups/group_members.php
index 8c9eba0cf1..6ae2aab5f8 100644
--- a/core/groups/group_members.php
+++ b/core/groups/group_members.php
@@ -43,6 +43,9 @@
 		return;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -77,7 +80,6 @@
 	$sql = "select domain_uuid, group_name from v_groups ";
 	$sql .= "where group_uuid = :group_uuid ";
 	$parameters['group_uuid'] = $group_uuid;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (is_array($row) && sizeof($row) != 0) {
 		$domain_uuid = $row["domain_uuid"];
@@ -91,7 +93,6 @@
 		$sql .= "domain_uuid = :domain_uuid ";
 		$sql .= "order by username ";
 		$parameters['domain_uuid'] = is_uuid($domain_uuid) ? $domain_uuid : $_SESSION['domain_uuid'];
-		$database = new database;
 		$users = $database->select($sql, $parameters, 'all');
 		unset($sql, $parameters);
 	}
@@ -112,7 +113,6 @@
 	$sql .= "and ug.group_uuid = :group_uuid ";
 	$sql .= "order by d.domain_name asc, u.username asc ";
 	$parameters['group_uuid'] = $group_uuid;
-	$database = new database;
 	$user_groups = $database->select($sql, $parameters, 'all');
 	$num_rows = is_array($user_groups) && @sizeof($user_groups) != 0 ? sizeof($user_groups) : 0;
 	unset($sql, $parameters);
diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php
index c648dffa38..47c7d00485 100644
--- a/core/groups/group_permissions.php
+++ b/core/groups/group_permissions.php
@@ -42,12 +42,14 @@
 		$group_uuid = $_GET['group_uuid'];
 	}
 
+//connect to the database
+	$database = new database;
+
 //get the group_name
 	if (isset($group_uuid) && is_uuid($group_uuid)) {
 		$sql = "select group_name from v_groups ";
 		$sql .= "where group_uuid = :group_uuid ";
 		$parameters['group_uuid'] = $group_uuid;
-		$database = new database;
 		$group_name = $database->select($sql, $parameters, 'column');
 		unset($sql, $parameters);
 	}
@@ -85,7 +87,6 @@
 					$sql .= "and (".implode(' or ', $sql_where_or).") ";
 				}
 				$parameters['domain_uuid'] = $_SESSION["domain_uuid"];
-				$database = new database;
 				$result = $database->select($sql, $parameters, 'all');
 				if (is_array($result) && @sizeof($result) != 0) {
 					foreach ($result as $row) {
@@ -125,7 +126,6 @@
 	$sql .= "	order by p.application_name, p.permission_name asc "; 
 	$parameters['group_name'] = $group_name;
 	$parameters['group_uuid'] = $group_uuid;
-	$database = new database;
 	$group_permissions = $database->select($sql, $parameters, 'all');
 
 //process the user data and save it to the database
@@ -241,7 +241,6 @@
 
 		//save the save array
 			if (!empty($array['save']) && is_array($array['save']) && @sizeof($array['save']) != 0) {
-				$database = new database;
 				$database->app_name = 'groups';
 				$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
 				$database->save($array['save']);
@@ -251,7 +250,6 @@
 		//delete the delete array
 			if (!empty($array['delete']) && is_array($array['delete']) && @sizeof($array['delete']) != 0) {
 				if (permission_exists('group_permission_delete')) {
-					$database = new database;
 					$database->app_name = 'groups';
 					$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
 					$database->delete($array['delete']);
diff --git a/core/groups/groups.php b/core/groups/groups.php
index 44246f0115..46f951f5b7 100644
--- a/core/groups/groups.php
+++ b/core/groups/groups.php
@@ -38,6 +38,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -104,7 +107,6 @@
 		$sql .= ") \n";
 		$parameters['search'] = '%'.$search.'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? '', 'column');
 
 //prepare to page the results
@@ -120,7 +122,6 @@
 	$sql = str_replace('count(*)', '*', $sql);
 	$sql .= order_by($order_by, $order, 'group_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$groups = $database->select($sql, $parameters ?? '', 'all');
 	unset($sql, $parameters);
 
diff --git a/core/groups/permissions_copy.php b/core/groups/permissions_copy.php
index 0b629efa12..9236524cce 100644
--- a/core/groups/permissions_copy.php
+++ b/core/groups/permissions_copy.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -58,7 +61,6 @@
 			$sql .= "and group_uuid = :group_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['group_uuid'] = $group_uuid;
-			$database = new database;
 			$row = $database->select($sql, $parameters, 'row');
 			if (is_array($row) && sizeof($row) != 0) {
 				$domain_uuid = $row["domain_uuid"];
@@ -74,7 +76,6 @@
 			}
 			$array['groups'][0]['group_name'] = $new_group_name;
 			$array['groups'][0]['group_description'] = $new_group_desc;
-			$database = new database;
 			$database->app_name = 'groups';
 			$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
 			$database->save($array);
@@ -91,39 +92,41 @@
 				$sql .= "and domain_uuid is null ";
 			}
 			$parameters['group_name'] = $group_name;
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'all');
 			unset($sql, $parameters);
 
 			if (is_array($result) && sizeof($result) != 0) {
 				foreach ($result as $x => $row) {
 					//define group permissions values
-						$domain_uuid = $row["domain_uuid"];
-						$permission_name = $row["permission_name"];
-						$group_name = $row["group_name"];
+					$domain_uuid = $row["domain_uuid"];
+					$permission_name = $row["permission_name"];
+					$group_name = $row["group_name"];
+
 					//build insert array
-						$array['group_permissions'][$x]['group_permission_uuid'] = uuid();
-						if (is_uuid($domain_uuid)) {
-							$array['group_permissions'][$x]['domain_uuid'] = $domain_uuid;
-						}
-						$array['group_permissions'][$x]['permission_name'] = $permission_name;
-						$array['group_permissions'][$x]['group_name'] = $new_group_name;
-						$array['group_permissions'][$x]['group_uuid'] = $new_group_uuid;
+					$array['group_permissions'][$x]['group_permission_uuid'] = uuid();
+					if (is_uuid($domain_uuid)) {
+						$array['group_permissions'][$x]['domain_uuid'] = $domain_uuid;
+					}
+					$array['group_permissions'][$x]['permission_name'] = $permission_name;
+					$array['group_permissions'][$x]['group_name'] = $new_group_name;
+					$array['group_permissions'][$x]['group_uuid'] = $new_group_uuid;
 				}
 				if (is_array($array) && sizeof($array) != 0) {
 					//grant temporary permissions
-						$p = new permissions;
-						$p->add('group_permission_add', 'temp');
+					$p = new permissions;
+					$p->add('group_permission_add', 'temp');
+
 					//execute insert
-						$database = new database;
-						$database->app_name = 'groups';
-						$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
-						$database->save($array);
-						unset($array);
+					$database->app_name = 'groups';
+					$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
+					$database->save($array);
+					unset($array);
+
 					//revoke temporary permissions
-						$p->delete('group_permission_add', 'temp');
+					$p->delete('group_permission_add', 'temp');
+
 					//set message
-						message::add($text['message-copy']);
+					message::add($text['message-copy']);
 				}
 			}
 			unset($result, $row);
diff --git a/core/menu/menu.php b/core/menu/menu.php
index c0ae33f265..55bf3d89bd 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -90,14 +93,12 @@
 	if (isset($sql_search)) {
 		$sql .= "where ".$sql_search;
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? '', 'column');
 
 //get the list
 	$sql = str_replace('count(menu_uuid)', '*', $sql);
 	$sql .= order_by($order_by, $order, 'menu_name', 'asc');
 	$sql .= limit_offset($rows_per_page ?? '', $offset ?? '');
-	$database = new database;
 	$menus = $database->select($sql, $parameters ?? '', 'all');
 	unset($sql, $parameters);
 
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index 252d8277f2..e93e4d4627 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -98,7 +101,6 @@
 					$array['menus'][0]['menu_name'] = $menu_name;
 					$array['menus'][0]['menu_language'] = $menu_language;
 					$array['menus'][0]['menu_description'] = $menu_description;
-					$database = new database;
 					$database->app_name = 'menu';
 					$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
 					$database->save($array);
@@ -116,7 +118,6 @@
 					$array['menus'][0]['menu_name'] = $menu_name;
 					$array['menus'][0]['menu_language'] = $menu_language;
 					$array['menus'][0]['menu_description'] = $menu_description;
-					$database = new database;
 					$database->app_name = 'menu';
 					$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
 					$database->save($array);
@@ -136,7 +137,6 @@
 		$sql = "select * from v_menus ";
 		$sql .= "where menu_uuid = :menu_uuid ";
 		$parameters['menu_uuid'] = $menu_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$menu_uuid = $row["menu_uuid"];
diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php
index fa95e7ca23..b7b0d2625c 100644
--- a/core/menu/menu_item_move_down.php
+++ b/core/menu/menu_item_move_down.php
@@ -37,6 +37,9 @@
 		return;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -54,7 +57,6 @@ if (count($_GET)>0) {
 	$sql .= "order by menu_item_order desc ";
 	$sql .= "limit 1 offset 0";
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$highestmenu_item_order = $database->select($sql, $parameters, 'column');
 
 	if ($menu_item_order != $highestmenu_item_order) {
@@ -68,7 +70,6 @@ if (count($_GET)>0) {
 			$sql .= "and menu_item_order = :menu_item_order ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['menu_item_order'] = $menu_item_order + 1;
-			$database = new database;
 			$database->app_name = 'menu';
 			$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
 			$database->execute($sql, $parameters);
@@ -81,7 +82,6 @@ if (count($_GET)>0) {
 			$sql .= "and menu_item_id = :menu_item_id ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['menu_item_id'] = $menu_item_id;
-			$database = new database;
 			$database->app_name = 'menu';
 			$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
 			$database->execute($sql, $parameters);
diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php
index 488f1d4c31..a59cc9c7e9 100644
--- a/core/menu/menu_item_move_up.php
+++ b/core/menu/menu_item_move_up.php
@@ -36,6 +36,9 @@
 		return;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -58,7 +61,6 @@ if (count($_GET)>0) {
 			$sql .= "and menu_order = :menu_order ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['menu_order'] = $menu_order - 1;
-			$database = new database;
 			$database->app_name = 'menu';
 			$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
 			$database->execute($sql, $parameters);
@@ -71,7 +73,6 @@ if (count($_GET)>0) {
 			$sql .= "and menu_item_id = :menu_item_id ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['menu_item_id'] = $menu_item_id;
-			$database = new database;
 			$database->app_name = 'menu';
 			$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
 			$database->execute($sql, $parameters);
diff --git a/core/notifications/notification_edit.php b/core/notifications/notification_edit.php
index 880715d473..5351bcc1db 100644
--- a/core/notifications/notification_edit.php
+++ b/core/notifications/notification_edit.php
@@ -37,13 +37,15 @@ Mark J Crane <markjcrane@fusionpbx.com>
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
 
 // retrieve software uuid
 	$sql = "select software_uuid, software_url, software_version from v_software";
-	$database = new database;
 	$row = $database->select($sql, null, 'row');
 	if (is_array($row) && sizeof($row) != 0) {
 		$software_uuid = $row["software_uuid"];
@@ -86,7 +88,6 @@ Mark J Crane <markjcrane@fusionpbx.com>
 				case "mysql" :	$sql = "select version();";			break;
 				case "sqlite" :	$sql = "select sqlite_version();";	break;
 			}
-			$database = new database;
 			$db_ver = $database->select($sql, null, 'column');
 			unset($sql);
 
@@ -155,7 +156,6 @@ Mark J Crane <markjcrane@fusionpbx.com>
 
 		// get local project notification participation flag
 		$sql = "select project_notifications from v_notifications";
-		$database = new database;
 		$current_project_notifications = $database->select($sql, null, 'row');
 		unset($sql);
 
@@ -182,7 +182,6 @@ Mark J Crane <markjcrane@fusionpbx.com>
 				if ($response['result'] == 'deleted') {
 					// set local project notification participation flag to false
 					$sql = "update v_notifications set project_notifications = 'false'";
-					$database = new database;
 					$database->execute($sql);
 					unset($sql);
 				}
@@ -242,7 +241,6 @@ Mark J Crane <markjcrane@fusionpbx.com>
 		if ($response['result'] == 'updated' || $response['result'] == 'inserted') {
 			// set local project notification participation flag to true
 			$sql = "update v_notifications set project_notifications = 'true'";
-			$database = new database;
 			$database->execute($sql);
 			unset($sql);
 			// set message
@@ -269,7 +267,6 @@ Mark J Crane <markjcrane@fusionpbx.com>
 
 		// check local project notification participation flag
 		$sql = "select project_notifications from v_notifications";
-		$database = new database;
 		$row = $database->select($sql, null, 'row');
 		if (is_array($row) && sizeof($row) != 0) {
 			$setting["project_notifications"] = $row["project_notifications"];
diff --git a/core/upgrade/index.php b/core/upgrade/index.php
index e3749f27cd..ac036c3301 100644
--- a/core/upgrade/index.php
+++ b/core/upgrade/index.php
@@ -43,6 +43,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -403,7 +406,6 @@
 		echo 		"<input type='checkbox' name='action[menu_defaults]' id='do_menu' value='1' onclick=\"event.stopPropagation(); $('#sel_menu').fadeToggle('fast');\">";
 		echo 		"<select name='sel_menu' id='sel_menu' class='formfld' style='display: none; vertical-align: middle; margin-left: 5px;' onclick=\"event.stopPropagation();\">";
 		$sql = "select * from v_menus order by menu_name asc;";
-		$database = new database;
 		$result = $database->select($sql, null, 'all');
 		if (is_array($result) && sizeof($result) != 0) {
 			foreach ($result as $row) {
diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php
index 26a8f73cd3..e196cb4193 100644
--- a/core/upgrade/upgrade.php
+++ b/core/upgrade/upgrade.php
@@ -204,12 +204,13 @@
 
 //restore the default menu
 	if ($upgrade_type == 'menus') {
+		//connect to the database
+		$database = new database;
 
 		//get the menu uuid and language
 		$sql = "select menu_uuid, menu_language from v_menus ";
 		$sql .= "where menu_name = :menu_name ";
 		$parameters['menu_name'] = 'default';
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && sizeof($row) != 0) {
 			$menu_uuid = $row["menu_uuid"];
diff --git a/core/users/user_imports.php b/core/users/user_imports.php
index 38706e773c..49ca8f127e 100644
--- a/core/users/user_imports.php
+++ b/core/users/user_imports.php
@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -253,7 +256,6 @@
 
 		//get the groups
 			$sql = "select * from v_groups where domain_uuid is null ";
-			$database = new database;
 			$groups = $database->select($sql, null, 'all');
 			unset($sql);
 
@@ -349,7 +351,6 @@
 								if ($row_id === 1000) {
 
 									//save to the data
-										$database = new database;
 										$database->app_name = 'users';
 										$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
 										$database->save($array);
@@ -376,7 +377,6 @@
 
 				//save to the data
 					if (!empty($array)) {
-						$database = new database;
 						$database->app_name = 'users';
 						$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
 						$database->save($array);
diff --git a/core/users/user_json.php b/core/users/user_json.php
index 8be3c63847..e9a75e7fe4 100644
--- a/core/users/user_json.php
+++ b/core/users/user_json.php
@@ -46,11 +46,13 @@
 		$search =  strtolower($_GET["search"]);
 	}
 
+//connect to the database
+	$database = new database;
+
 //check to see if contact details are in the view
 	$sql = "select * from view_users ";
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$parameters = null;
-	$database = new database;
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$row = $database->select($sql, $parameters, 'row');
 	if (isset($row['contact_organization'])) {
@@ -93,7 +95,6 @@
 	$parameters['group_level'] = $_SESSION['user']['group_level'];
 	$sql .= order_by($order_by, $order, 'username', 'asc');
 	$sql .= "limit 300\n";
-	$database = new database;
 	$users = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/users/users.php b/core/users/users.php
index f65efff8ec..bd80b6a196 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -38,6 +38,9 @@
 		exit;
 	}
 
+//connect to the database
+	$database = new database;
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -53,7 +56,6 @@
 	$sql = "select * from view_users ";
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$parameters = null;
-	$database = new database;
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$row = $database->select($sql, $parameters, 'row');
 	if (isset($row['contact_organization'])) {
@@ -138,7 +140,6 @@
 	$sql .= "	or group_level is null ";
 	$sql .= ") ";
 	$parameters['group_level'] = $_SESSION['user']['group_level'];
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
@@ -179,7 +180,6 @@
 	$parameters['group_level'] = $_SESSION['user']['group_level'];
 	$sql .= order_by($order_by, $order, 'username', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$users = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);