diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java b/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java
index 3e0475f2af..f306475aa7 100644
--- a/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java
+++ b/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java
@@ -40,6 +40,7 @@ import org.springframework.extensions.webscripts.WebScriptException;
 import freemarker.cache.MultiTemplateLoader;
 import freemarker.cache.StrongCacheStorage;
 import freemarker.cache.TemplateLoader;
+import freemarker.core.TemplateClassResolver;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateExceptionHandler;
@@ -199,6 +200,8 @@ public class RepositoryTemplateProcessor extends FreeMarkerProcessor
         // set output encoding
         config.setOutputEncoding("UTF-8");
         
+        config.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
+        
         templateConfig = config;
     }