diff --git a/examples/official-site/sqlpage/migrations/01_documentation.sql b/examples/official-site/sqlpage/migrations/01_documentation.sql
index a1ffae67..f9820988 100644
--- a/examples/official-site/sqlpage/migrations/01_documentation.sql
+++ b/examples/official-site/sqlpage/migrations/01_documentation.sql
@@ -436,6 +436,9 @@ INSERT INTO uploaded_file(name, data) VALUES(:filename, sqlpage.uploaded_file_da
 You can specify the way form data should be encoded by setting the `enctype`
 top-level property on the form.
 
+The default validation button `formenctype` is set to
+`application/x-www-form-urlencoded` unless a `file` input is present.
+
 You may also specify `formenctype` on `submit` and `image` type inputs.
 This will take precedence over the `enctype` specified on the form and is
 useful in the case there are multiple `submit` buttons on the form.
@@ -450,7 +453,6 @@ many short ascii text values are submitted.
   {
     "component": "form",
     "method": "post",
-    "enctype": "multipart/form-data",
     "title": "Submit with different encoding types",
     "validate": "Submit with form encoding type",
     "action": "examples/handle_enctype.sql"
diff --git a/sqlpage/templates/form.handlebars b/sqlpage/templates/form.handlebars
index 896c76d5..a735ad68 100644
--- a/sqlpage/templates/form.handlebars
+++ b/sqlpage/templates/form.handlebars
@@ -1,8 +1,13 @@
+<!--
+    For compatibility, use multipart/form-data as form enctype.
+    But for efficiency, use application/x-www-form-urlencoded on default submit button.
+-->
+{{#delay}}formenctype="{{default enctype "application/x-www-form-urlencoded"}}"{{/delay}}
 <form 
     {{#if id}}id="{{id}}"{{/if}}
     class="my-3 {{class}}"
     method="{{default method "post"}}"
-    {{#if enctype}}enctype="{{enctype}}"{{/if}}
+    enctype="{{default enctype "multipart/form-data"}}"
     {{#if action}}action="{{action}}"
     {{else}}
     {{#if id}}action="#{{id}}"{{/if}}
@@ -120,12 +125,11 @@
             {{/if}}
             {{/if}}
             {{#if (eq type "file")}}
-                <!-- Change the form encoding type if this is a file input-->
-                {{#delay}}formenctype="multipart/form-data"{{/delay}}
+                <!-- Do not override form encoding type {{flush_delayed}} -->
             {{/if}}
         {{/each_row}}
         </div>
-        {{#if (ne validate '')}} 
+        {{#if (ne validate '')}}
             <input class="btn
             btn-{{default validate_color "primary"}}
             {{#if validate_shape}} btn-{{validate_shape}} {{/if}}