diff --git a/html/pages/temperatures.php b/html/pages/temperatures.php
index e98d8d99e..960a332da 100644
--- a/html/pages/temperatures.php
+++ b/html/pages/temperatures.php
@@ -8,40 +8,42 @@ if($_SESSION['userlevel'] >= '5') {
 
 $query = mysql_query($sql);
 
-echo("<table cellspacing=0 cellpadding=2 width=100%>");
+echo('<table cellspacing="0" cellpadding="2" width="100%">');
 
-echo("<tr class=tablehead>
-        <th width=280>Device</th>
-        <th width=280>Sensor</th>
+echo('<tr class=tablehead>
+        <th width="280">Device</th>
+        <th width="280">Sensor</th>
 	<th></th>
-        <th width=100>Current</th>
-        <th width=100>Alert</th>
+	<th></th>
+        <th width="100">Current</th>
+        <th width="100">Alert</th>
         <th>Notes</th>
-      </tr>");
+      </tr>');
 
 $row = 1;
 
-while($temp = mysql_fetch_array($query)) {
-
+while($temp = mysql_fetch_array($query))
+{
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
   $speed = humanspeed($temp['ifSpeed']);
   $type = humanmedia($temp['ifType']);
 
-  $weekly_temp  = "graph.php?id=" . $temp['temp_id'] . "&type=temperature&from=$week&to=$now&width=500&height=150";
+  $weekly_temp  = "graph.php?id=" . $temp['temp_id'] . "&amp;type=temperature&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $temp_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_temp\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $temp['temp_descr'] . "</a>";
 
   $temp_perc = $temp['temp_current'] / $temp['temp_limit'] * 100;
   $temp_colour = percent_colour($temp_perc);
 
+  if($temp['temp_current'] >= $temp['temp_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
+   
+  $temp_day    = "graph.php?id=" . $temp['temp_id'] . "&amp;type=temperature&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
+  $temp_week   = "graph.php?id=" . $temp['temp_id'] . "&amp;type=temperature&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
+  $temp_month  = "graph.php?id=" . $temp['temp_id'] . "&amp;type=temperature&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
+  $temp_year   = "graph.php?id=" . $temp['temp_id'] . "&amp;type=temperature&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
 
-  $temp_day    = "graph.php?id=" . $temp['temp_id'] . "&type=temperature&from=$day&to=$now&width=300&height=100";
-  $temp_week   = "graph.php?id=" . $temp['temp_id'] . "&type=temperature&from=$week&to=$now&width=300&height=100";
-  $temp_month  = "graph.php?id=" . $temp['temp_id'] . "&type=temperature&from=$month&to=$now&width=300&height=100";
-  $temp_year   = "graph.php?id=" . $temp['temp_id'] . "&type=temperature&from=$year&to=$now&width=300&height=100";
-
-  $temp_minigraph = "<img src='graph.php?id=" . $temp['temp_id'] . "&type=temperature&from=$day&to=$now&width=100&height=20'";
+  $temp_minigraph = "<img src='graph.php?id=" . $temp['temp_id'] . "&amp;type=temperature&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
   $temp_minigraph .= " onmouseover=\"return overlib('<div class=list-large>".$temp['hostname']." - ".$temp['temp_descr'];
   $temp_minigraph .= "</div><div style=\'width: 750px\'><img src=\'$temp_day\'><img src=\'$temp_week\'><img src=\'$temp_month\'><img src=\'$temp_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
 
@@ -49,6 +51,7 @@ while($temp = mysql_fetch_array($query)) {
           <td class=list-bold>" . generatedevicelink($temp) . "</td>
           <td>$temp_popup</td>
 	  <td>$temp_minigraph</td>
+	  <td width=100>$alert</td>
           <td style='color: $temp_colour; text-align: center; font-weight: bold;'>" . $temp['temp_current'] . " &deg;C</td>
           <td style='text-align: center'>" . $temp['temp_limit'] . " &deg;C</td>
           <td>" . $temp['temp_notes'] . "</td>