diff --git a/basis/furnace/auth/features/edit-profile/edit-profile.xml b/basis/furnace/auth/features/edit-profile/edit-profile.xml
index b964094fc2..f486f4e246 100644
--- a/basis/furnace/auth/features/edit-profile/edit-profile.xml
+++ b/basis/furnace/auth/features/edit-profile/edit-profile.xml
@@ -61,7 +61,7 @@
 	</table>
 
 	<p>
-		<input type="submit" value="Update" />
+		<button>Update</button>
 		<t:validation-messages />
 	</p>
 
diff --git a/basis/furnace/auth/features/recover-password/recover-1.xml b/basis/furnace/auth/features/recover-password/recover-1.xml
index 46e52d5319..a8b67513a4 100644
--- a/basis/furnace/auth/features/recover-password/recover-1.xml
+++ b/basis/furnace/auth/features/recover-password/recover-1.xml
@@ -32,7 +32,7 @@
 
 		</table>
 
-		<input type="submit" value="Recover password" />
+		<button>Recover password</button>
 
 	</t:form>
 
diff --git a/basis/furnace/auth/features/recover-password/recover-3.xml b/basis/furnace/auth/features/recover-password/recover-3.xml
index a71118ea31..a8ea635a1f 100644
--- a/basis/furnace/auth/features/recover-password/recover-3.xml
+++ b/basis/furnace/auth/features/recover-password/recover-3.xml
@@ -31,7 +31,7 @@
 		</table>
 
 		<p>
-			<input type="submit" value="Set password" />
+			<button>Set password</button>
 			<t:validation-messages />
 		</p>
 
diff --git a/basis/furnace/auth/features/registration/register.xml b/basis/furnace/auth/features/registration/register.xml
index 9815f21945..1e52dfd522 100644
--- a/basis/furnace/auth/features/registration/register.xml
+++ b/basis/furnace/auth/features/registration/register.xml
@@ -62,7 +62,7 @@
 
 		<p>
 
-			<input type="submit" value="Register" />
+			<button>Register</button>
 			<t:validation-messages />
 
 		</p>
diff --git a/basis/furnace/auth/login/login.xml b/basis/furnace/auth/login/login.xml
index 81f9520e76..766c097ca5 100644
--- a/basis/furnace/auth/login/login.xml
+++ b/basis/furnace/auth/login/login.xml
@@ -35,7 +35,7 @@
 
 		<p>
 
-			<input type="submit" value="Log in" />
+			<button>Log in</button>
 			<t:validation-messages />
 
 		</p>
diff --git a/extra/webapps/wee-url/shorten.xml b/extra/webapps/wee-url/shorten.xml
index 8df7774fba..53f611a8d8 100644
--- a/extra/webapps/wee-url/shorten.xml
+++ b/extra/webapps/wee-url/shorten.xml
@@ -4,7 +4,7 @@
 
         <t:form t:action="$wee-url">
 		<p>Shorten URL: <t:field t:name="url" t:size="40" /></p>
-		<input type="submit" value="Shorten" />
+		<button>Shorten</button>
 	</t:form>
 
 </t:chloe>
diff --git a/extra/webapps/wiki/edit.xml b/extra/webapps/wiki/edit.xml
index 90843a7140..9cb2e92f93 100644
--- a/extra/webapps/wiki/edit.xml
+++ b/extra/webapps/wiki/edit.xml
@@ -16,7 +16,7 @@
 		</p>
 
 		<p>
-			<input type="submit" value="Save" />
+			<button>Save</button>
 		</p>
 
 	</t:form>
diff --git a/extra/webapps/wiki/revisions.xml b/extra/webapps/wiki/revisions.xml
index 68f377e70b..1d9c01fd65 100644
--- a/extra/webapps/wiki/revisions.xml
+++ b/extra/webapps/wiki/revisions.xml
@@ -32,7 +32,7 @@
 			</tr>
 		</table>
 
-		<input type="submit" value="View" />
+		<button>View</button>
 	</t:form>
 
 </t:chloe>