diff --git a/core/domain_settings/domain_delete.php b/core/domain_settings/domain_delete.php
index 8d73fb78e2..ba1abc0f78 100644
--- a/core/domain_settings/domain_delete.php
+++ b/core/domain_settings/domain_delete.php
@@ -190,12 +190,8 @@ if (strlen($id) > 0) {
 }
 
 //redirect the browser
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=domains.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: domains.php");
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domain_edit.php b/core/domain_settings/domain_edit.php
index 3293153b01..7f0b0775bc 100644
--- a/core/domain_settings/domain_edit.php
+++ b/core/domain_settings/domain_edit.php
@@ -126,17 +126,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			unset($_SESSION['switch']);
 
 		//redirect the browser
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=domains.php\">\n";
-			echo "<div align='center'>\n";
 			if ($action == "update") {
-				echo $text['message-update']."\n";
+				$_SESSION["message"] = $text['message-update'];
 			}
 			if ($action == "add") {
-				echo $text['message-add']."\n";
+				$_SESSION["message"] = $text['message-add'];
 			}
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			header("Location: domains.php");
 			return;
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
diff --git a/core/domain_settings/domain_setting_delete.php b/core/domain_settings/domain_setting_delete.php
index 051f097435..591ce10387 100644
--- a/core/domain_settings/domain_setting_delete.php
+++ b/core/domain_settings/domain_setting_delete.php
@@ -56,12 +56,8 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=domain_edit.php?id=$domain_uuid\">\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: domain_edit.php?id=".$domain_uuid);
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index df5f11b32c..4b31b6bea1 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -219,17 +219,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the browser
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=domain_edit.php?id=$domain_uuid\">\n";
-				echo "<div align='center'>\n";
-				if ($action == "add") {
-					echo $text['message-add']."\n";
-				}
 				if ($action == "update") {
-					echo $text['message-update']."\n";
+					$_SESSION["message"] = $text['message-update'];
 				}
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				if ($action == "add") {
+					$_SESSION["message"] = $text['message-add'];
+				}
+				header("Location: domain_edit.php?id=".$domain_uuid);
 				return;
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)