diff --git a/html/includes/print-quadgraphs.inc.php b/html/includes/print-quadgraphs.inc.php
index 9a528b773..4ce8661be 100644
--- a/html/includes/print-quadgraphs.inc.php
+++ b/html/includes/print-quadgraphs.inc.php
@@ -15,7 +15,6 @@ if($_SESSION['widescreen'])
 
 $graph_array['to']     = $config['time']['now'];
 
-#echo('<p class="badtobias"');
 foreach ($periods as $period)
 {
   $graph_array['from']        = $config['time'][$period];
@@ -30,6 +29,5 @@ foreach ($periods as $period)
 
   echo(overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
 }
-#echo('</p>');
 
 ?>
diff --git a/html/index.php b/html/index.php
index 4e7ecb7d1..6d62f327b 100755
--- a/html/index.php
+++ b/html/index.php
@@ -327,7 +327,16 @@ $('INPUT.auto-hint, TEXTAREA.auto-hint').focus(function() {
 <?php
 if (is_array($pagetitle))
 {
-  array_unshift($pagetitle,$config['page_title']);
+  # page_title is put in front, unless page_title_prefix is set
+  if (!$config['page_title_prefix']) { $config['page_title_prefix'] = $config['page_title']; }
+  
+  # if prefix is set, put it in front
+  if ($config['page_title_prefix']) { array_unshift($pagetitle,$config['page_title_prefix']); }
+  
+  # if suffix is set, put it in the back
+  if ($config['page_title_suffix']) { $pagetitle[] = $config['page_title_suffix']; }
+  
+  # create and set the title
   $title = join(" - ",$pagetitle);
   echo("<script type=\"text/javascript\">\ndocument.title = '$title';\n</script>");
 }