diff --git a/resources/templates/edit.html b/resources/templates/edit.html
index 3213d34..3379dc5 100644
--- a/resources/templates/edit.html
+++ b/resources/templates/edit.html
@@ -13,7 +13,7 @@
                 <p class="widget">
                     <label for="summary">{% i18n what-changed-prompt %}</label>
                     <input name="summary" id="summary" type="text"
-                        value="{%if exists%}{%else%}New file {{title}}{%endif%}" required/>
+                        value="{%if exists%}{%else%}New file {{page}}{%endif%}" required/>
                 </p>
                 <p class="widget">
                     <label for="submit">{% i18n save-prompt %}</label>
diff --git a/resources/templates/upload.html b/resources/templates/upload.html
index 46a48be..53284ec 100644
--- a/resources/templates/upload.html
+++ b/resources/templates/upload.html
@@ -4,7 +4,7 @@
         {% if uploaded %}
           {% if is-image %}
             <p>
-              <img id="uploaded-image" alt="Uploaded image" src="content/uploads/{{uploaded}}"/>
+              <img id="uploaded-image" alt="Uploaded image" src="uploads/{{uploaded}}"/>
 
               {% i18n file-upload-link-text %}: