diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php
index 752486885c..f0300690b9 100644
--- a/app/conference_profiles/conference_profile_edit.php
+++ b/app/conference_profiles/conference_profile_edit.php
@@ -28,91 +28,93 @@
 	}
 
 //get http post variables and set them to php variables
-	if (count($_POST)>0) {
+	if (count($_POST) > 0) {
 		$profile_name = check_str($_POST["profile_name"]);
 		$profile_enabled = check_str($_POST["profile_enabled"]);
 		$profile_description = check_str($_POST["profile_description"]);
 	}
-
-if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
-
-	$msg = '';
-	if ($action == "update") {
-		$conference_profile_uuid = check_str($_POST["conference_profile_uuid"]);
-	}
-
-	//check for all required data
-		if (strlen($profile_name) == 0) { $msg .= $text['message-required']." ".$text['label-profile_name']."<br>\n"; }
-		if (strlen($profile_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-profile_enabled']."<br>\n"; }
-		//if (strlen($profile_description) == 0) { $msg .= $text['message-required']." ".$text['label-profile_description']."<br>\n"; }
-		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "resources/header.php";
-			require_once "resources/persist_form_var.php";
-			echo "<div align='center'>\n";
-			echo "<table><tr><td>\n";
-			echo $msg."<br />";
-			echo "</td></tr></table>\n";
-			persistformvar($_POST);
-			echo "</div>\n";
-			require_once "resources/footer.php";
-			return;
-		}
-
-	//add or update the database
-		if ($_POST["persistformvar"] != "true") {
-			if ($action == "add" && permission_exists('conference_profile_add')) {
-				$sql = "insert into v_conference_profiles ";
-				$sql .= "(";
-				$sql .= "domain_uuid, ";
-				$sql .= "conference_profile_uuid, ";
-				$sql .= "profile_name, ";
-				$sql .= "profile_enabled, ";
-				$sql .= "profile_description ";
-				$sql .= ")";
-				$sql .= "values ";
-				$sql .= "(";
-				$sql .= "'$domain_uuid', ";
-				$sql .= "'".uuid()."', ";
-				$sql .= "'$profile_name', ";
-				$sql .= "'$profile_enabled', ";
-				$sql .= "'$profile_description' ";
-				$sql .= ")";
-				$db->exec(check_sql($sql));
-				unset($sql);
-
-				$_SESSION["message"] = $text['message-add'];
-				header("Location: conference_profiles.php");
+//check to see if the http post exists
+	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
+	
+		//get the uuid
+			if ($action == "update") {
+				$conference_profile_uuid = check_str($_POST["conference_profile_uuid"]);
+			}
+	
+		//check for all required data
+			$msg = '';
+			if (strlen($profile_name) == 0) { $msg .= $text['message-required']." ".$text['label-profile_name']."<br>\n"; }
+			if (strlen($profile_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-profile_enabled']."<br>\n"; }
+			//if (strlen($profile_description) == 0) { $msg .= $text['message-required']." ".$text['label-profile_description']."<br>\n"; }
+			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
+				require_once "resources/header.php";
+				require_once "resources/persist_form_var.php";
+				echo "<div align='center'>\n";
+				echo "<table><tr><td>\n";
+				echo $msg."<br />";
+				echo "</td></tr></table>\n";																	
+				persistformvar($_POST);
+				echo "</div>\n";
+				require_once "resources/footer.php";
 				return;
-
-			} //if ($action == "add")
-
-			if ($action == "update" && permission_exists('conference_profile_edit')) {
-				$sql = "update v_conference_profiles set ";
-				$sql .= "profile_name = '$profile_name', ";
-				$sql .= "profile_enabled = '$profile_enabled', ";
-				$sql .= "profile_description = '$profile_description' ";
-				$sql .= "where conference_profile_uuid = '$conference_profile_uuid'";
-				$sql .= "and domain_uuid = '$domain_uuid' ";
-				$db->exec(check_sql($sql));
-				unset($sql);
-
-				$_SESSION["message"] = $text['message-update'];
-				header("Location: conference_profiles.php");
-				return;
-
-			} //if ($action == "update")
-		} //if ($_POST["persistformvar"] != "true")
-} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
+			}
+	
+		//add or update the database
+			if ($_POST["persistformvar"] != "true") {
+				if ($action == "add" && permission_exists('conference_profile_add')) {
+					$sql = "insert into v_conference_profiles ";
+					$sql .= "(";
+					//$sql .= "domain_uuid, ";
+					$sql .= "conference_profile_uuid, ";
+					$sql .= "profile_name, ";
+					$sql .= "profile_enabled, ";
+					$sql .= "profile_description ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					//$sql .= "'$domain_uuid', ";
+					$sql .= "'".uuid()."', ";
+					$sql .= "'$profile_name', ";
+					$sql .= "'$profile_enabled', ";
+					$sql .= "'$profile_description' ";
+					$sql .= ")";
+					$db->exec(check_sql($sql));
+					unset($sql);
+	
+					$_SESSION["message"] = $text['message-add'];
+					header("Location: conference_profiles.php");
+					return;
+	
+				} //if ($action == "add")
+	
+				if ($action == "update" && permission_exists('conference_profile_edit')) {
+					$sql = "update v_conference_profiles set ";
+					$sql .= "profile_name = '$profile_name', ";
+					$sql .= "profile_enabled = '$profile_enabled', ";
+					$sql .= "profile_description = '$profile_description' ";
+					$sql .= "where conference_profile_uuid = '$conference_profile_uuid'";
+					//$sql .= "and domain_uuid = '$domain_uuid' ";
+					$db->exec(check_sql($sql));
+					unset($sql);
+	
+					$_SESSION["message"] = $text['message-update'];
+					header("Location: conference_profiles.php");
+					return;
+	
+				} //if ($action == "update")
+			} //if ($_POST["persistformvar"] != "true")
+	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //pre-populate the form
 	if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
 		$conference_profile_uuid = check_str($_GET["id"]);
 		$sql = "select * from v_conference_profiles ";
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and conference_profile_uuid = '$conference_profile_uuid' ";
+		$sql .= "where conference_profile_uuid = '$conference_profile_uuid' ";
+		//$sql .= "and domain_uuid = '$domain_uuid' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
 		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+
 		foreach ($result as &$row) {
 			$profile_name = $row["profile_name"];
 			$profile_enabled = $row["profile_enabled"];
@@ -200,4 +202,4 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>