diff --git a/pyoes/templates/pyoes/header.jinja2 b/pyoes/templates/pyoes/header.jinja2
index b47a44bb..5dd3f883 100644
--- a/pyoes/templates/pyoes/header.jinja2
+++ b/pyoes/templates/pyoes/header.jinja2
@@ -69,29 +69,28 @@
{% set login_nav = login_nav|default(default_login_nav) -%}
{% set login_sub_nav = login_sub_nav|default(default_login_sub_nav) -%}
- {% set login_user = login_user|default(request.user.userid) -%}
- {% if not request.user %}
-
- {% for caption, href in login_nav %}
- - {{ caption }}
- {% endfor %}
-
-
- {% else %}
-
- {% if not login_user == ' ' %}
- -
- {{ login_user }}
-
- {% for caption, href in login_sub_nav %}
+ {% if login_nav|length > 0 %}
+ {% if not request.user %}
+
+ {% for caption, href in login_nav %}
- {{ caption }}
{% endfor %}
-
-
+
+ {% else %}
+
{% endif %}
-
{% endif %}
+
{% endblock %}
diff --git a/pyoes/templates/pyoes/layout.jinja2 b/pyoes/templates/pyoes/layout.jinja2
index 349f96f0..35bea5fb 100644
--- a/pyoes/templates/pyoes/layout.jinja2
+++ b/pyoes/templates/pyoes/layout.jinja2
@@ -11,7 +11,6 @@
{% set login_sub_nav = login_sub_nav -%}
{% set service_nav = service_nav -%}
{% set home_link = home_link -%}
-{% set login_user = login_user -%}
{% set default_footer_nav = [
('Toegankelijkheid', '/toegankelijkheid'),