diff --git a/thold_functions.php b/thold_functions.php
index a3bab979..597da980 100644
--- a/thold_functions.php
+++ b/thold_functions.php
@@ -2579,8 +2579,8 @@ function thold_check_threshold(&$thold_data) {
 						'current'         => $thold_data['lastread'],
 						'status'          => ($ra ? ST_NOTIFYRAW : ST_NOTIFYWA),
 						'description'     => ($maint_dev ? $subject . '. ' . __('Only logging, maint device', 'thold') : $subject),
-						'emails'          => $alert_emails,
-						'bcc_emails'      => $alert_bcc_emails]
+						'emails'          => $warning_emails,
+						'bcc_emails'      => $warning_bcc_emails]
 					);
 				} elseif (($thold_data['thold_warning_fail_count'] >= $warning_trigger) && ($thold_data['thold_fail_count'] >= $trigger)) {
 					$subject = get_email_subject('ALERT > WARNING', false, $lastread, $ra, $warning_breach_up, $thold_data);
@@ -3390,7 +3390,7 @@ function thold_check_threshold(&$thold_data) {
 						'host_id'         => $thold_data['host_id'],
 						'local_graph_id'  => $thold_data['local_graph_id'],
 						'threshold_id'    => $thold_data['id'],
-						'threshold_value' => ($breach_up ? $thold_data['time_hi'] : $thold_data['time_low']),
+						'threshold_value' => ($warning_breach_up ? $thold_data['time_warning_hi'] : $thold_data['time_warning_low']),
 						'current'         => $thold_data['lastread'],
 						'status'          => ($ra ? ST_NOTIFYRAW : ST_NOTIFYWA),
 						'description'     => ($maint_dev ? $subject . '. ' . __('Only logging, maint device', 'thold') : $subject),
@@ -3406,7 +3406,7 @@ function thold_check_threshold(&$thold_data) {
 						'host_id'         => $thold_data['host_id'],
 						'local_graph_id'  => $thold_data['local_graph_id'],
 						'threshold_id'    => $thold_data['id'],
-						'threshold_value' => ($warning_breach_up ? $thold_data['time_hi'] : $thold_data['time_low']),
+						'threshold_value' => ($warning_breach_up ? $thold_data['time_warning_hi'] : $thold_data['time_warning_low']),
 						'current'         => $thold_data['lastread'],
 						'status'          => ST_NOTIFYRAW,
 						'description'     => ($maint_dev ? $subject . '. ' . __('Only logging, maint device', 'thold') : $subject),
@@ -3420,7 +3420,7 @@ function thold_check_threshold(&$thold_data) {
 						'host_id'         => $thold_data['host_id'],
 						'local_graph_id'  => $thold_data['local_graph_id'],
 						'threshold_id'    => $thold_data['id'],
-						'threshold_value' => ($warning_breach_up ? $thold_data['time_hi'] : $thold_data['time_low']),
+						'threshold_value' => ($warning_breach_up ? $thold_data['time_warning_hi'] : $thold_data['time_warning_low']),
 						'current'         => $thold_data['lastread'],
 						'status'          => ST_TRIGGERW,
 						'description'     => ($maint_dev ? $subject . '. ' . __('Only logging, maint device', 'thold') : $subject),