diff --git a/core/src/main/resources/template/simple/submit.ftl b/core/src/main/resources/template/simple/submit.ftl
index 24db4a886..d77b5d090 100644
--- a/core/src/main/resources/template/simple/submit.ftl
+++ b/core/src/main/resources/template/simple/submit.ftl
@@ -61,6 +61,9 @@
 </#if>
 <#else>
 <input type="submit"<#rt/>
+<#if parameters.nameValue?has_content>
+ value="<@s.property value="parameters.nameValue"/>"<#rt/>
+</#if>
 </#if>
 <#if parameters.id?has_content>
  id="${parameters.id?html}"<#rt/>
@@ -68,9 +71,6 @@
 <#if parameters.name?has_content>
  name="${parameters.name?html}"<#rt/>
 </#if>
-<#if parameters.nameValue?has_content>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
 <#if parameters.disabled!false>
  disabled="disabled"<#rt/>
 </#if>
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
index 2a33037e2..71fbb149f 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
@@ -232,7 +232,7 @@ public class SubmitTest extends AbstractUITagTest {
         tag.doStartTag();
         tag.doEndTag();
 
-        assertEquals("<input type=\"submit\" id=\"myname\" name=\"myname\" value=\"Submit\"/>", writer.toString().trim());
+        assertEquals("<input type=\"submit\" value=\"Submit\" id=\"myname\" name=\"myname\"/>", writer.toString().trim());
     }
 
     /**
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
index ef5882ccb..330df2c4c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
+    <td colspan="2"><div class="formButton"><input type="submit" value="bar" id="myname" name="myname" disabled="disabled" tabindex="1"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
index 36b1554f5..e4b7c8b9d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
+    <td colspan="2"><div class="formButton"><input type="submit" value="Submit" id="myname" name="myname" title="mytitle"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
index d83c44fcf..8632bc0ba 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
+    <td colspan="2"><div class="formButton"><input type="image" alt="bar" id="myname" name="myname" disabled="disabled"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
index 9cd5d0246..41dba2aad 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div class="formButton"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
+    <td colspan="2"><div class="formButton"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname"/></div></td>
 </tr>