diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 8bec839795..e55023cd48 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
{% if v %}
-
+
{% if v.agendaposter %}
-
+
{% endif %}
diff --git a/files/templates/default.html b/files/templates/default.html
index 379e490675..fc1f1084c2 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -7,7 +7,7 @@
{% if v %}
-
+
{% if v.agendaposter %}
-
+
{% endif %}
diff --git a/files/templates/log.html b/files/templates/log.html
index 077cce3568..7f5eefd651 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
{% block content %}
{% if v %}
-
+
{% if v.agendaposter %}
-
+
{% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html
index b17fedd526..b4b413073e 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
{% endblock %}
-
+
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 557840a1c9..49ecb7fa31 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
2-Step Login - {{'SITE_NAME' | app_config}}
-
+
diff --git a/files/templates/settings.html b/files/templates/settings.html
index bfd918fca3..ef15d691c2 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -34,7 +34,7 @@
-
+
{% if v.agendaposter %}
- {% elif v.css %}
+ {% elif v.css and not request.path.startswith('/settings/css') %}
{% endif %}
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 0ff6c9a7af..b85703539b 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -39,10 +39,10 @@
{% if v %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index b37f916d16..52be19ac5c 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}
-
+
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 4bb78653c5..a4dd514e0e 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}
-
+
diff --git a/files/templates/submit.html b/files/templates/submit.html
index f10c2aa449..70badc9c60 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
{% block stylesheets %}
{% if v %}
-
+
{% if v.agendaposter %}
-
+
{% endif %}
{% endblock %}