diff --git a/core/databases/database_delete.php b/core/databases/database_delete.php
index a6f3fdb7e4..7b0c1d9ae0 100644
--- a/core/databases/database_delete.php
+++ b/core/databases/database_delete.php
@@ -53,12 +53,8 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "resources/header.php";
-echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
-echo "<div align='center'>\n";
-echo $text['message-delete']."\n";
-echo "</div>\n";
-require_once "resources/footer.php";
+$_SESSION["message"] = $text['message-delete'];
+header("Location: databases.php");
 return;
 
 ?>
\ No newline at end of file
diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index 103d357cd9..717608215e 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -143,12 +143,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "app_defaults.php";
 
 			//redirect the browser
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
-				echo "<div align='center'>\n";
-				echo $text['message-add']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-add'];
+				header("Location: databases.php");
 				return;
 		} //if ($action == "add")
 
@@ -173,12 +169,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "app_defaults.php";
 
 			//redirect the browser
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
-				echo "<div align='center'>\n";
-				echo $text['message-update']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-update'];
+				header("Location: databases.php");
 				return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")