diff --git a/addressbook/add.php b/addressbook/add.php
index a828b917b3..efaeaaf119 100755
--- a/addressbook/add.php
+++ b/addressbook/add.php
@@ -24,7 +24,7 @@
 	$phpgw_info['flags']['enable_contacts_class'] = True;
 	include('../header.inc.php');
 
-	$t = new Template(PHPGW_APP_TPL);
+	$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
 	$t->set_file(array('add' => 'add.tpl'));
 
 	$this = CreateObject('phpgwapi.contacts');
diff --git a/addressbook/edit.php b/addressbook/edit.php
index f1ee8493a3..2a1e511e76 100755
--- a/addressbook/edit.php
+++ b/addressbook/edit.php
@@ -71,7 +71,7 @@
 		$fields = addressbook_read_entry($ab_id,$qfields);
 		addressbook_form('edit','edit.php','Edit',$fields[0],$customfields);
 
-		$t = new Template(PHPGW_APP_TPL);
+		$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
 		$t->set_file(array("edit" => "edit.tpl"));
 
 		$t->set_var('ab_id',$ab_id);
diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index 8b97fcc205..11c994f6d0 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -293,8 +293,8 @@
 
 		$t = new Template(PHPGW_APP_TPL);
 		$t->set_file(array('form' => 'form.tpl'));
-		$t->set_block('form','add','add');
-		$t->set_block('form','edit','edit');
+		//$t->set_block('form','add','add');
+		//$t->set_block('form','edit','edit');
 
 		$email        = $fields['email'];
 		$emailtype    = $fields['email_type'];
diff --git a/addressbook/index.php b/addressbook/index.php
index 375d644ce1..b344763f83 100755
--- a/addressbook/index.php
+++ b/addressbook/index.php
@@ -20,7 +20,7 @@
 
 	include('../header.inc.php');
 
-	$t = new Template(PHPGW_APP_TPL);
+	$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
 	$t->set_file(array('addressbook_list_t' => 'index.tpl'));
 	$t->set_block('addressbook_list_t','addressbook_header','addressbook_header');
 	$t->set_block('addressbook_list_t','column','column');
diff --git a/addressbook/view.php b/addressbook/view.php
index 8023914d6e..bdfae8171a 100755
--- a/addressbook/view.php
+++ b/addressbook/view.php
@@ -45,7 +45,7 @@
 		echo parse_navbar();
 	}
 
-	$t = new Template(PHPGW_APP_TPL);
+	$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
 	$t->set_file(array('view_t' => 'view.tpl'));
 	$t->set_block('view_t','view_header','view_header');
 	$t->set_block('view_t','view_row','view_row');