diff --git a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
index e40debf9e..01d31e302 100644
--- a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
@@ -48,8 +48,8 @@
 <#if parameters.delay?exists>
  searchDelay="${parameters.delay?c}"<#rt/>
 </#if>
-<#if parameters.disabled?exists>
- disabled="${parameters.disabled?string?html}"<#rt/>
+<#if parameters.disabled?default(false)>
+ disabled="disabled"<#rt/>
 </#if>
 <#if parameters.dropdownWidth?exists>
  dropdownWidth="${parameters.dropdownWidth?c}"<#rt/>
@@ -168,11 +168,11 @@
             ${tmpListValue?html}<#t/>
     </option><#lt/>
     </@s.iterator>
-  </select>    
+  </select>
 </#if>
 <#if parameters.label?if_exists != "">
 	<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
-</#if>	
+</#if>
 <#if parameters.pushId>
 <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
 </#if>
diff --git a/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl b/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
index c8bdfae3a..2cb33ac8b 100644
--- a/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
@@ -91,15 +91,15 @@
   <#if parameters.valueNotifyTopics?if_exists != "">
 	valueNotifyTopics="${parameters.valueNotifyTopics?html}"<#rt/>
   </#if>
-  <#if parameters.disabled?exists>
-    disabled="${parameters.disabled?string?html}"<#rt/>
+  <#if parameters.disabled?default(false)>
+    disabled="disabled"<#rt/>
   </#if>
   saveFormat="rfc"<#rt/>
   <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 ></div>
 <#if parameters.label?if_exists != "">
 	<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
-</#if>	
+</#if>
 <#if parameters.pushId>
 <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
 </#if>
diff --git a/plugins/dojo/src/main/resources/template/ajax/div.ftl b/plugins/dojo/src/main/resources/template/ajax/div.ftl
index 6489bf1b5..78bb7d9aa 100644
--- a/plugins/dojo/src/main/resources/template/ajax/div.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/div.ftl
@@ -45,8 +45,8 @@
   <#if parameters.preload?exists>
     preload="${parameters.preload?string?html}"<#rt/>
   </#if>
-  <#if parameters.disabled?exists>
-    disabled="${parameters.disabled?string?html}"<#rt/>
+  <#if parameters.disabled?default(false)>
+    disabled="disabled"<#rt/>
   </#if>
   <#include "/${parameters.templateDir}/ajax/ajax-common.ftl" />
   <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
index 14688001e..6a11cd246 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
@@ -1,4 +1,4 @@
-<div dojoType="struts:StrutsDatePicker" 
+<div dojoType="struts:StrutsDatePicker"
      id="id"
      value="2008-03-03"
      lang="i"
@@ -12,7 +12,7 @@
      staticDisplay="false"
      templateCssPath="j"
      valueNotifyTopics="k"
-     disabled="true"
+     disabled="disabled"
      saveFormat="rfc">
 </div>
 <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("id");</script>