diff --git a/app/xmpp/profile_delete.php b/app/xmpp/profile_delete.php
index 2e3a0a3179..2339abcd9c 100644
--- a/app/xmpp/profile_delete.php
+++ b/app/xmpp/profile_delete.php
@@ -42,7 +42,6 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "resources/header.php";
 
 $domain_name = $_SESSION['domains'][$domain_uuid]['domain_name'];
 
@@ -95,7 +94,4 @@ $action = "delete";
 
 include "update_complete.php";
 
-//show the footer
-require_once "resources/footer.php";
-
 ?>
diff --git a/app/xmpp/update_complete.php b/app/xmpp/update_complete.php
index a7b080dff8..6ffc3aa778 100644
--- a/app/xmpp/update_complete.php
+++ b/app/xmpp/update_complete.php
@@ -1,10 +1,10 @@
-<meta http-equiv="refresh" content="2;url=xmpp.php">
-<div align='center'>
 <?php
+
 switch ($action) {
-	case "add" : 		echo $text['message-add']."\n"; 	break;
-	case "update" : 	echo $text['message-update']."\n";	break;
-	case "delete" :		echo $text['message-delete']."\n";	break;
+	case "add" : 		$_SESSION["message"] = $text['message-add']; 		break;
+	case "update" : 	$_SESSION["message"] = $text['message-update']; 	break;
+	case "delete" : 	$_SESSION["message"] = $text['message-delete']; 	break;
 }
-?>
-</div>
+header("Location: xmpp.php");
+
+?>
\ No newline at end of file
diff --git a/app/xmpp/xmpp.php b/app/xmpp/xmpp.php
index c4d88315b1..46cc4bed88 100644
--- a/app/xmpp/xmpp.php
+++ b/app/xmpp/xmpp.php
@@ -42,6 +42,7 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
+
 require_once "resources/header.php";
 $page["title"] = $text['title-xmpp'];
 
diff --git a/app/xmpp/xmpp_profile_edit.php b/app/xmpp/xmpp_profile_edit.php
index faab0b54c6..4cc570e19a 100644
--- a/app/xmpp/xmpp_profile_edit.php
+++ b/app/xmpp/xmpp_profile_edit.php
@@ -52,7 +52,6 @@ if (isset($_REQUEST["id"])) {
 	$action = "add";
 }
 
-require_once "resources/header.php";
 if ($action == "update") {
 	$page["title"] = $text['title-xmpp-edit'];
 }
@@ -97,6 +96,7 @@ if ($action == "update") {
 
 if ((!isset($_REQUEST['submit'])) || ($_REQUEST['submit'] != $text['button-save'])) {
 	// If we arent saving a Profile Display the form.
+	require_once "resources/header.php";
 	include "profile_edit.php";
 	require_once "resources/footer.php";
 	exit;
@@ -116,6 +116,7 @@ if (strlen($request['default_exten']) < 1) $error .= $text['message-required'].$
 if (strlen($error) > 0) {
 	include "errors.php";
 	$profile = $request;
+	require_once "resources/header.php";
 	include "profile_edit.php";
 	require_once "resources/footer.php";
 	exit;
@@ -241,7 +242,4 @@ if ($fp) {
 
 include "update_complete.php";
 
-//show the footer
-require_once "resources/footer.php";
-
 ?>
\ No newline at end of file