diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 959c1b34ae..248a1112e3 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -1495,6 +1495,8 @@ function __autoload($class)
 	// fixing warnings generated by php 5.3.8 is_a($obj) trying to autoload huge strings
 	if (strlen($class) > 64) return;
 
+	if ($class == 'etemplate_new') $class = 'etemplate';
+
 	$components = explode('_',$class);
 	$app = array_shift($components);
 	// classes using the new naming schema app_class_name, eg. admin_cmd
diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index 9eba1c11f4..bbbb00fcf6 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -119,7 +119,7 @@
 			}
 			if(typeof app[window.egw_appName] == "object")
 			{
-				callback = function(et2) {app[window.egw_appName].et2_ready(et2)};
+				callback = function(et2) {app[window.egw_appName].et2_ready(et2);};
 			}
 			var node = document.getElementById(data.DOMNodeID);
 			if(!node)
@@ -128,7 +128,7 @@
 			}
 			else
 			{
-				var et2 = new etemplate2(node, "etemplate::ajax_process_content");
+				var et2 = new etemplate2(node, "etemplate_new::ajax_process_content");
 				et2.load(data.name,data.url,data.data,callback);
 			}
 		}