diff --git a/source/_includes/daily-email-form.html.twig b/source/_includes/daily-email-form.html.twig
index 58bd1eaf9..8cf194e2b 100644
--- a/source/_includes/daily-email-form.html.twig
+++ b/source/_includes/daily-email-form.html.twig
@@ -25,7 +25,9 @@
       data-stacked="false"
       class="seva-fields formkit-fields"
     >
-      <!-- {intro && <p class="mb-8 text-center">{intro}</p>} -->
+      {% if intro %}
+        <p class="mb-8 text-center">{{ intro }}</p>
+      {% endif %}
 
       <div class="formkit-field">
         <input
diff --git a/source/_pages/404.md b/source/_pages/404.md
new file mode 100644
index 000000000..5559e421a
--- /dev/null
+++ b/source/_pages/404.md
@@ -0,0 +1,22 @@
+---
+title: Page not found
+---
+
+{% block content %}
+Perhaps you were looking for one of these pages:
+
+- [Products and services](/pricing)
+- [Public speaking and workshops](/talks)
+- [My daily email list](/daily)
+- [The Beyond Blocks podcast](/podcast)
+
+If you were looking for something else, you can [search for it](/search).
+{% endblock %}
+
+{% block content_bottom %}
+  {% include 'daily-email-form.html.twig' with {
+    intro: 'Sign up and get daily emails about Drupal, PHP and software development.'
+  } %}
+
+  {% include 'about-me.html.twig' %}
+{% endblock %}