diff --git a/addressbook/inc/hook_home.inc.php b/addressbook/inc/hook_home.inc.php
index 8c27ce4002..43d586c650 100644
--- a/addressbook/inc/hook_home.inc.php
+++ b/addressbook/inc/hook_home.inc.php
@@ -22,7 +22,7 @@
 	if ($GLOBALS['phpgw_info']['user']['apps']['addressbook']
 		&& $GLOBALS['phpgw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays'])
 	{
-		echo "\n<!-- Birthday info -->\n";
+		$tmp = "\n<!-- Birthday info -->\n";
 
 		$c = CreateObject('phpgwapi.contacts');
 		$qfields = array(
@@ -71,10 +71,6 @@
 				'text' => lang("Today is x's birthday!", $val['n_given'] . ' ' . $val['n_family']),
 				'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' .  $val['id'])
 			);
-//			$tmp = '<a href="'
-//				. $GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' .  $val['id']) . '">'
-//				. $val['n_given'] . ' ' . $val['n_family'] . '</a>';
-//			echo '<tr><td align="left">' . lang("Today is x's birthday!", $tmp) . '</td></tr>' . "\n";
 		}
 
 		$tomorrow = $GLOBALS['phpgw']->common->show_date($now + 86400,'n/d/');
@@ -87,16 +83,14 @@
 				'text' => lang("Tomorrow is x's birthday.", $val['n_given'] . ' ' . $val['n_family']),
 				'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id'])
 			);
-//			$tmp = '<a href="'
-//				. $GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' .  $val['id']) . '">'
-//				. $val['n_given'] . ' ' . $val["n_family"] . '</a>';
-//			echo '<tr><td align="left">' . lang("Tomorrow is x's birthday.", $tmp) . '</td></tr>' . "\n";
 		}
-//		if(count($portalbox->data))
-//		{
-			echo $portalbox->draw();
-//		}
+		if(count($portalbox->data))
+		{
+			$tmp = $portalbox->draw();
+		}
 		unset($portalbox);
-		echo "\n<!-- Birthday info -->\n";
+		$tmp .= "\n<!-- Birthday info -->\n";
+		$GLOBALS['phpgw']->template->set_var('phpgw_body',$tmp,True);
+		unset($tmp);
 	}
 ?>
diff --git a/calendar/inc/hook_home.inc.php b/calendar/inc/hook_home.inc.php
index ad98e81050..2d0be8791a 100755
--- a/calendar/inc/hook_home.inc.php
+++ b/calendar/inc/hook_home.inc.php
@@ -85,7 +85,7 @@
 
 		$portalbox->data = Array();
 
-		echo "\n".'<!-- BEGIN Calendar info -->'."\n".$portalbox->draw($GLOBALS['extra_data'])."\n".'<!-- END Calendar info -->'."\n";
+		$GLOBALS['phpgw']->template->set_var('phpgw_body', "\n".'<!-- BEGIN Calendar info -->'."\n".$portalbox->draw($GLOBALS['extra_data'])."\n".'<!-- END Calendar info -->'."\n",True);
 		unset($cal);
 	} 
 	flush();