diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/inputtransferselect.js b/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
similarity index 100%
rename from plugins/dojo/src/main/resources/org/apache/struts2/static/inputtransferselect.js
rename to core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/optiontransferselect.js b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
similarity index 100%
rename from plugins/dojo/src/main/resources/org/apache/struts2/static/optiontransferselect.js
rename to core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/validationClient.js b/core/src/main/resources/org/apache/struts2/static/validationClient.js
similarity index 100%
rename from plugins/dojo/src/main/resources/org/apache/struts2/static/validationClient.js
rename to core/src/main/resources/org/apache/struts2/static/validationClient.js
diff --git a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
index 0622914a4..62a6d16ed 100644
--- a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
@@ -1,3 +1,4 @@
+<#include "/${parameters.templateDir}/ajax/controlheader.ftl" />
 <#if parameters.href?exists>
   <input dojoType="struts:ComboBox"<#rt/>
   dataUrl="${parameters.href}"<#rt/>
@@ -122,6 +123,8 @@
     </@s.iterator>
   </select>    
 </#if>
-
+<#if parameters.label?if_exists != "">
+	<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+</#if>	
 
 
diff --git a/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl b/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
index ee1fcc541..1ac8ce333 100644
--- a/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
@@ -1,4 +1,6 @@
-<#--include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /-->
+<#if parameters.label?if_exists != "">
+	<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
+</#if>
 <#if parameters.form?exists && parameters.form.validate?default(false) == true>
 	<#-- can't mutate the data model in freemarker -->
     <#if parameters.onblur?exists>
diff --git a/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl b/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
index b7b3ed627..cf151588a 100644
--- a/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
@@ -1,6 +1,7 @@
 <script type="text/javascript">
     dojo.require("dojo.widget.DatePicker");
-</script>
+</script>	
+<#include "/${parameters.templateDir}/ajax/controlheader.ftl" />
 <div
    <#if parameters.type?if_exists == "date">
      dojoType="dropdowndatepicker"<#rt/>
@@ -71,3 +72,6 @@
   saveFormat="rfc"<#rt/>
   <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 ></div>
+<#if parameters.label?if_exists != "">
+	<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+</#if>	
diff --git a/plugins/dojo/src/main/resources/template/ajax/form-close.ftl b/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
index 5f9bdcf6c..c0fa8756f 100644
--- a/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
@@ -83,7 +83,7 @@ dojo.require("dojo.event.connect");
  Code that will add javascript needed for tooltips
 --><#t/>
 	<#lt/><!-- javascript that is needed for tooltips -->
-	<#lt/><script type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
+	<#lt/><script type="text/javascript">dojo.require("dojo.widget.Tooltip");dojo.require("dojo.fx.html");</script>
 
 </table>
 </form>
diff --git a/plugins/dojo/src/main/resources/template/ajax/head.ftl b/plugins/dojo/src/main/resources/template/ajax/head.ftl
index ac7a22955..aa17e231f 100644
--- a/plugins/dojo/src/main/resources/template/ajax/head.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/head.ftl
@@ -2,7 +2,7 @@
     // Dojo configuration
     djConfig = {
         baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo' includeParams="none" encode='false'/>",
-        isDebug: ${parameters.debug?default(false)},
+        isDebug: ${parameters.debug?default(false)?string},
         bindEncoding: "${parameters.encoding}",
         debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
     };