diff --git a/app/bridges/bridge_edit.php b/app/bridges/bridge_edit.php
index 96c7df99d7..579a159732 100644
--- a/app/bridges/bridge_edit.php
+++ b/app/bridges/bridge_edit.php
@@ -107,7 +107,7 @@
 				if ($action == "update") {
 					$_SESSION["message"] = $text['message-update'];
 				}
-				header('Location: bridge_edit.php?id='.$bridge_uuid);
+				header('Location: bridges.php');
 				return;
 			}
 	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
@@ -171,7 +171,6 @@
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
 	echo "	<select class='formfld' name='bridge_enabled'>\n";
-	echo "		<option value=''></option>\n";
 	if ($bridge_enabled == "true") {
 		echo "		<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 	}
diff --git a/app/bridges/resources/classes/bridges.php b/app/bridges/resources/classes/bridges.php
index f77c40047f..306ba6a081 100644
--- a/app/bridges/resources/classes/bridges.php
+++ b/app/bridges/resources/classes/bridges.php
@@ -43,17 +43,18 @@ if (!class_exists('bridges')) {
 						//delete the checked rows
 							if ($action == 'delete') {
 								$database = new database;
-								foreach($bridges as $row) {
+								foreach($bridges as $x => $row) {
 									if ($row['action'] == 'delete' or $row['checked'] == 'true') {
-										$array['bridges'][0]['bridge_uuid'] = $row['bridge_uuid'];
-										$array['bridges'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
-
-										$database->app_name = 'bridges';
-										$database->app_uuid = 'a6a7c4c5-340a-43ce-bcbc-2ed9bab8659d';
-										$database->delete($array);
-										unset($array);
+										$array['bridges'][$x]['bridge_uuid'] = $row['bridge_uuid'];
+										$array['bridges'][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
 									}
 								}
+								if (is_array($array) && @sizeof($array) != 0) {
+									$database->app_name = 'bridges';
+									$database->app_uuid = 'a6a7c4c5-340a-43ce-bcbc-2ed9bab8659d';
+									$database->delete($array);
+									unset($array);
+								}
 								unset($bridges);
 							}
 					}