diff --git a/app.py b/app.py
index 6ea8aed..206a4ca 100644
--- a/app.py
+++ b/app.py
@@ -118,6 +118,15 @@ def upload():
             petname_message=pname_msg,
             generation_message=gen_msg,
         )
+    else:
+        pname = upload_form.petname.data
+        pname_msg = "You are still {}".format(pname)
+        return render_template(
+            "index.html",
+            upload_form=upload_form,
+            petname_message=pname_msg,
+            petname=pname,
+        )
 
     pname = petname.generate()
     pname_msg = "You have become {}".format(pname)
diff --git a/static/styles.css b/static/styles.css
index 017a99c..ba4ceb2 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -51,3 +51,7 @@ object {
   max-height: 100%;
   max-width: 100%;
 }
+
+.error {
+  color: red;
+}
diff --git a/templates/index.html b/templates/index.html
index 1cf0748..c488e4a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -11,6 +11,13 @@
   </head>
   <body>
     <h1 class="title">Temporary Indexing</h1>
+
+    {% for field, errors in upload_form.errors.items() %}
+      <div class="error">
+        {{ upload_form[field].label }}: {{ ', '.join(errors) }}
+      </div>
+    {% endfor %}
+
     <p>
       {{ petname_message}}. You are anonymous. You may reveal your identity
       later when saving your generated files.
@@ -21,14 +28,12 @@
     {% endif %}
   <div class="container">
     <div class="forms">
-        <form method="POST" action="/upload" enctype="multipart/form-data">
+        <form class="metafields" method="POST" action="/upload" enctype="multipart/form-data">
           {{ upload_form.csrf_token }}
 
           {{ upload_form.metadata.label }}
           {{ upload_form.metadata }}
-        </form>
 
-        <form class="metafields" method="POST" action="/upload" enctype="multipart/form-data">
           {{ upload_form.title.label }}
           {{ upload_form.title }}
 
@@ -54,14 +59,8 @@
           <input type="submit" value="generate" />
         </form>
 
-        {% if upload_form.metadata.errors %}
-        <ul class="errors">
-          {% for error in upload_form.metadata.errors %}
-          <li>{{ error }}</li>
-          {% endfor %}
-        </ul>
-        {% endif %}
       </div>
+
       <div class="iframe">
         <object data="{{ pdf }}" type="application/pdf">
           <iframe src="{{ pdf }}"></iframe>
