diff --git a/thold_functions.php b/thold_functions.php
index a3bab97..8e2cff9 100644
--- a/thold_functions.php
+++ b/thold_functions.php
@@ -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),
@@ -3440,7 +3440,7 @@ function thold_check_threshold(&$thold_data) {
 
 				$subject = get_email_subject('NORMAL', false, $lastread, false, false, $thold_data);
 
-				if ($alertstat != 0 && $warning_failures < $warning_trigger && $thold_data['restored_alert'] != 'on') {
+				if ($alertstat != 0 && $warning_failures >= $warning_trigger && $thold_data['restored_alert'] != 'on') {
 					if (!$maint_dev) {
 						if ($syslog) {
 							logger($subject, $url, $syslog_priority, $syslog_facility);
@@ -3509,7 +3509,7 @@ function thold_check_threshold(&$thold_data) {
 						WHERE id = ?',
 							[$thold_data['id']]);
 					}
-				} elseif ($alertstat != 0 && $failures < $trigger && $thold_data['restored_alert'] != 'on') {
+				} elseif ($alertstat != 0 && $failures >= $trigger && $thold_data['restored_alert'] != 'on') {
 					$subject = get_email_subject('NORMAL', false, $lastread, false, false, $thold_data);
 
 					if (!$maint_dev) {