diff --git a/core/src/main/resources/template/ajax/submit-ajax.ftl b/core/src/main/resources/template/ajax/submit-ajax.ftl
index f46e56654..a66bf8998 100644
--- a/core/src/main/resources/template/ajax/submit-ajax.ftl
+++ b/core/src/main/resources/template/ajax/submit-ajax.ftl
@@ -3,10 +3,6 @@
     <td colspan="2"><div <#rt/>
 -->
 <#include "/${parameters.templateDir}/${themeProperties.parent}/controlheader.ftl" />
-<#if parameters.align?exists>
-    align="${parameters.align?html}"<#t/>
-</#if>
-><#t/>
 <button type="submit" dojoType="BindButton"<#rt/>
 <#if parameters.form?exists && parameters.form.id?exists>
  formId="${parameters.form.id}"<#rt/>
diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
index d67ccbf40..acdf2d92a 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -1,2 +1,6 @@
 <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" />
-    <td>
+    <td
+<#if parameters.align?exists>
+    align="${parameters.align?html}"<#t/>
+</#if>
+><#t/>