diff --git a/html/includes/common/device-summary-horiz.inc.php b/html/includes/common/device-summary-horiz.inc.php
index 75d110a375..47ddd4a7ea 100644
--- a/html/includes/common/device-summary-horiz.inc.php
+++ b/html/includes/common/device-summary-horiz.inc.php
@@ -40,8 +40,8 @@ $temp_output .= '
     <tr class="active">
       <td><a href="services/">Services</a></td>
       <td><a href="services/"><span>'.$services['count'].'</span></a></td>
-      <td><a href="services/state=up/view=details/"><span class="green">'.$services['up'].'</span></a></td>
-      <td><a href="services/state=down/view=details/"><span class="red"> '.$services['down'].'</span></a></td>
+      <td><a href="services/state=ok/view=details/"><span class="green">'.$services['up'].'</span></a></td>
+      <td><a href="services/state=critical/view=details/"><span class="red"> '.$services['down'].'</span></a></td>
       <td><a href="services/ignore=1/view=details/"><span class="grey"> '.$services['ignored'].'</span></a></td>
       <td><a href="services/disabled=1/view=details/"><span class="black"> '.$services['disabled'].'</span></a></td>
       '.($config['summary_errors'] ? '<td>-</td>' : '').'
diff --git a/html/includes/common/device-summary-vert.inc.php b/html/includes/common/device-summary-vert.inc.php
index 647a036302..5f32137966 100644
--- a/html/includes/common/device-summary-vert.inc.php
+++ b/html/includes/common/device-summary-vert.inc.php
@@ -31,7 +31,7 @@ $temp_output .= '
 if ($config['show_services']) {
 
     $temp_output .= '
-      <td><a href="services/view=details/state=up/"><span class="green">'. $services['up'] .'</span></a></td>
+      <td><a href="services/view=details/state=ok/"><span class="green">'. $services['up'] .'</span></a></td>
 ';
 
 }
@@ -47,7 +47,7 @@ $temp_output .= '
 if ($config['show_services']) {
 
     $temp_output .= '
-      <td><a href="services/view=details/state=down/"><span class="red">'. $services['down'] .'</span></a></td>
+      <td><a href="services/view=details/state=critical/"><span class="red">'. $services['down'] .'</span></a></td>
 ';
 
 }
diff --git a/includes/caches/services.inc.php b/includes/caches/services.inc.php
index 5024058841..65fa421b4a 100644
--- a/includes/caches/services.inc.php
+++ b/includes/caches/services.inc.php
@@ -2,8 +2,8 @@
 
 if ($_SESSION['userlevel'] >= 5) {
     $data['count']    = array( 'query' => 'SELECT COUNT(*) FROM services');
-    $data['up']       = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '1'");
-    $data['down']     = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '0'");
+    $data['up']       = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '0'");
+    $data['down']     = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '2'");
     $data['ignored']  = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '1' AND `service_disabled` = '0'");
     $data['disabled'] = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_disabled` = '1'");
 }
@@ -14,12 +14,12 @@ else {
     );
 
     $data['up'] = array(
-        'query'  => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '1'",
+        'query'  => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '0'",
         'params' => array($_SESSION['user_id']),
     );
 
     $data['down'] = array(
-        'query'  => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '0'",
+        'query'  => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '2'",
         'params' => array($_SESSION['user_id']),
     );