diff --git a/soap.php b/soap.php
index 14a1a5e555..7537e14eac 100644
--- a/soap.php
+++ b/soap.php
@@ -16,7 +16,8 @@
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'disable_Template_class' => True,
 		'currentapp' => 'login',
-		'noheader'   => True
+		'noheader'   => True,
+		'disable_Template_class' => True
 	);
 
 	include('./header.inc.php');
diff --git a/xmlrpc.php b/xmlrpc.php
index 65342bfd7b..440b5f0cdd 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -15,7 +15,8 @@
 	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'currentapp' => 'login',
-		'noheader'   => True
+		'noheader'   => True,
+		'disable_Template_class' => True
 	);
 
 	include('./header.inc.php');
@@ -23,7 +24,7 @@
 	$server = CreateObject('phpgwapi.xmlrpc_server');
 	$server->authed = False;
 	/* _debug_array($server);exit; */
-	/* include(PHPGW_API_INC . '/xmlrpc.interop.php'); */
+	include(PHPGW_API_INC . '/xmlrpc.interop.php');
 
 	$headers = getallheaders();