diff --git a/files/templates/CHRISTMAS/header.html b/files/templates/CHRISTMAS/header.html
index 357ba31bc..bfb55fd2a 100644
--- a/files/templates/CHRISTMAS/header.html
+++ b/files/templates/CHRISTMAS/header.html
@@ -224,6 +224,6 @@
}
-{% if v %}
+{% if v and not error %}
{{v.formkey}}
{% endif %}
\ No newline at end of file
diff --git a/files/templates/CHRISTMAS/home.html b/files/templates/CHRISTMAS/home.html
index a722ca358..e920115d8 100644
--- a/files/templates/CHRISTMAS/home.html
+++ b/files/templates/CHRISTMAS/home.html
@@ -79,7 +79,7 @@
-{% if not v.fp %}
+{% if v and not v.fp %}
+
{% endblock %}
\ No newline at end of file
diff --git a/files/templates/default.html b/files/templates/default.html
index 3e61279fe..b9e5ad1b2 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -6,12 +6,12 @@
{% if v %}
-
+
{% if v.agendaposter %}{% elif v.css %}{% endif %}
{% else %}
-
+
{% endif %}
@@ -275,7 +275,7 @@
-
+ Action successful!
@@ -287,7 +287,7 @@
{% if v %}
-
+
{% endif %}
diff --git a/files/templates/header.html b/files/templates/header.html
index 7c7b5e6be..d5690c4b1 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -226,6 +226,6 @@
}
-{% if v %}
+{% if v and not error %}
{{v.formkey}}
{% endif %}
\ No newline at end of file
diff --git a/files/templates/log.html b/files/templates/log.html
index 68c3bbf24..4692d9f88 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,11 +6,11 @@
{% block content %}
{% if v %}
-
+
{% if v.agendaposter %}{% elif v.css %}{% endif %}
{% else %}
-
+
{% endif %}