diff --git a/templates/editcave.html b/templates/editcave.html
index 099eb42..bc3514d 100644
--- a/templates/editcave.html
+++ b/templates/editcave.html
@@ -1,7 +1,7 @@
 {% extends "cavebase.html" %}
 
 {% block title %}
-{% if cave.official_name %}
+{% if cave.official_name or cave.kataster_number or cave.unofficial_number  %}
 Edit Cave - {{cave.official_name|safe}} - {{cave.kataster_number}}
 {% else %}
 New Cave Creation Form
@@ -12,7 +12,7 @@ New Cave Creation Form
 {% include 'html_editor_scripts_css.html' %}
 {% endblock %}
 {% block content %}
-{% if cave.official_name %}
+{% if cave.official_name or cave.kataster_number or cave.unofficial_number  %}
 <h1>Edit Cave - {{cave.official_name|safe}} {{cave.reference}}</h1>
 <p>The fields on this form, two of which are vital, are documented explicitly on the page
 <a href="/handbook/survey/caveentryfields.html">cave entry fields</a>