diff --git a/config/alfresco/template-services-context.xml b/config/alfresco/template-services-context.xml
index 41e3171f13..1606b2d982 100644
--- a/config/alfresco/template-services-context.xml
+++ b/config/alfresco/template-services-context.xml
@@ -89,4 +89,16 @@
         </property>
     </bean>
     
+    <bean id="xmlDateTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.ISO8601DateFormatMethod">
+        <property name="extensionName">
+            <value>xmldate</value>
+        </property>
+    </bean>
+    
+    <bean id="urlEncodeTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.ISO8601DateFormatMethod">
+        <property name="extensionName">
+            <value>urlencode</value>
+        </property>
+    </bean>
+    
 </beans>
diff --git a/source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java b/source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java
index bfd20d6457..cc1b733f3b 100644
--- a/source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java
+++ b/source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java
@@ -41,7 +41,7 @@ import freemarker.template.TemplateModelException;
  * <p>
  * Usage: xmldate(Date date)
  */
-public final class ISO8601DateFormatMethod implements TemplateMethodModelEx
+public class ISO8601DateFormatMethod extends BaseTemplateExtensionImplementation implements TemplateMethodModelEx
 {
     /**
      * @see freemarker.template.TemplateMethodModel#exec(java.util.List)
diff --git a/source/java/org/alfresco/repo/template/UrlEncodeMethod.java b/source/java/org/alfresco/repo/template/UrlEncodeMethod.java
index 0ad536f737..42820dabff 100644
--- a/source/java/org/alfresco/repo/template/UrlEncodeMethod.java
+++ b/source/java/org/alfresco/repo/template/UrlEncodeMethod.java
@@ -41,7 +41,7 @@ import freemarker.template.TemplateScalarModel;
  * <p>
  * Usage: urlencode(String url)
  */
-public final class UrlEncodeMethod implements TemplateMethodModelEx
+public class UrlEncodeMethod extends BaseTemplateExtensionImplementation implements TemplateMethodModelEx
 {
     /**
      * @see freemarker.template.TemplateMethodModel#exec(java.util.List)