diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php
index 1662815096..31908178e4 100644
--- a/app/call_centers/call_center_agent_edit.php
+++ b/app/call_centers/call_center_agent_edit.php
@@ -128,6 +128,7 @@
 			if (empty($agent_no_answer_delay_time)) { $agent_no_answer_delay_time = "30"; }
 			if (empty($agent_reject_delay_time)) { $agent_reject_delay_time = "90"; }
 			if (empty($agent_busy_delay_time)) { $agent_busy_delay_time = "90"; }
+			if ($agent_record === null) { $agent_record = false; }
 
 		//add the call_center_agent_uuid
 			if (empty($call_center_agent_uuid)) {
@@ -313,6 +314,7 @@
 	if (empty($agent_no_answer_delay_time)) { $agent_no_answer_delay_time = "30"; }
 	if (empty($agent_reject_delay_time)) { $agent_reject_delay_time = "90"; }
 	if (empty($agent_busy_delay_time)) { $agent_busy_delay_time = "90"; }
+	if ($agent_record === null) { $agent_record = false; }
 
 //create token
 	$object = new token;
diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php
index 7d7dd63990..7bd55337ea 100644
--- a/app/call_centers/call_center_queue_edit.php
+++ b/app/call_centers/call_center_queue_edit.php
@@ -558,7 +558,6 @@
 	if (!empty($_GET) && is_uuid($_GET["id"]) && empty($_POST["persistformvar"])) {
 		$call_center_queue_uuid = $_GET["id"];
 		$sql = "select ";
-		$sql = "select ";
 		$sql .= "queue_name, ";
 		$sql .= "dialplan_uuid, ";
 		$sql .= "queue_extension, ";
@@ -701,6 +700,11 @@
 	if (empty($queue_tier_rule_wait_second)) { $queue_tier_rule_wait_second = "30"; }
 	if (empty($queue_discard_abandoned_after)) { $queue_discard_abandoned_after = "900"; }
 	if (empty($queue_context)) { $queue_context = $domain_name; }
+	if ($queue_record_template === null) { $queue_record_template = 'false'; }
+	if ($queue_tier_rules_apply === null) { $queue_tier_rules_apply = false; }
+	if ($queue_tier_rule_wait_multiply_level === null) { $queue_tier_rule_wait_multiply_level = true; }
+	if ($queue_tier_rule_no_agent_no_wait === null) { $queue_tier_rule_no_agent_no_wait = true; }
+	if ($queue_abandoned_resume_allowed === null) { $queue_abandoned_resume_allowed = false; }
 
 //create token
 	$object = new token;