diff --git a/app/extension_settings/extension_settings.php b/app/extension_settings/extension_settings.php
index a2cd197a80..0f800a734f 100755
--- a/app/extension_settings/extension_settings.php
+++ b/app/extension_settings/extension_settings.php
@@ -62,34 +62,25 @@
 			exit;
 		}
 
-		//prepare the array
-		foreach($extension_settings as $row) {
-			$array['extension_settings'][$x]['checked'] = $row['checked'];
-			$array['extension_settings'][$x]['extension_setting_uuid'] = $row['extension_setting_uuid'];
-			$array['extension_settings'][$x]['extension_setting_enabled'] = $row['extension_setting_enabled'];
-			$x++;
-		}
-
 		//prepare the database object
-		$database = new database;
-		$database->app_name = 'extension_settings';
-		$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
+		$obj = new extension_settings;
 
 		//send the array to the database class
 		switch ($action) {
 			case 'copy':
 				if (permission_exists('extension_setting_add')) {
-					$database->copy($array);
+					$obj->copy($extension_settings);
 				}
 				break;
 			case 'toggle':
 				if (permission_exists('extension_setting_edit')) {
-					$database->toggle($array);
+					$obj->toggle($extension_settings);
 				}
 				break;
 			case 'delete':
 				if (permission_exists('extension_setting_delete')) {
-					$database->delete($array);
+					$obj->extension_uuid = $extension_uuid;
+					$obj->delete($extension_settings);
 				}
 				break;
 		}
@@ -280,7 +271,7 @@
 			if (permission_exists('extension_setting_add') || permission_exists('extension_setting_edit') || permission_exists('extension_setting_delete')) {
 				echo "	<td class='checkbox'>\n";
 				echo "		<input type='checkbox' name='extension_settings[$x][checked]' id='checkbox_".$x."' class='checkbox_".$extension_setting_type."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all_".$extension_setting_type."').checked = false; }\">\n";
-				echo "		<input type='hidden' name='extension_settings[$x][extension_setting_uuid]' value='".escape($row['extension_setting_uuid'])."' />\n";
+				echo "		<input type='hidden' name='extension_settings[$x][uuid]' value='".escape($row['extension_setting_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
 			//if ($_GET['show'] == 'all' && permission_exists('extension_setting_all')) {
diff --git a/app/extension_settings/resources/classes/extension_settings.php b/app/extension_settings/resources/classes/extension_settings.php
index 0fe50b8889..e1221eb3c1 100755
--- a/app/extension_settings/resources/classes/extension_settings.php
+++ b/app/extension_settings/resources/classes/extension_settings.php
@@ -116,7 +116,7 @@ if (!class_exists('extension_settings')) {
 								//clear the cache	
 									$sql = "select extension, number_alias, user_context from v_extensions ";
 									$sql .= "where extension_uuid = :extension_uuid ";
-									$parameters['extension_uuid'] = $extension_uuid;
+									$parameters['extension_uuid'] = $this->extension_uuid;
 									$database = new database;
 									$extension = $database->select($sql, $parameters, 'row');
 									$cache = new cache;