diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 380d8e43..8529dfbb 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - TMS-996: Change bold image-caption text to normal
 - TMS-1009: Fix error when fetching Eventz response with languages other than fi & en
+- TMS-1015: Header accessibility fixes
 
 ## [1.54.5] - 2024-02-01
 
diff --git a/partials/shared/header-inner.dust b/partials/shared/header-inner.dust
index ea7c0451..9a7a89f1 100644
--- a/partials/shared/header-inner.dust
+++ b/partials/shared/header-inner.dust
@@ -11,14 +11,14 @@
 
             {?Header.lang_nav_horizontal}
                 <div class="is-hidden-touch">
-                    {>"ui/menu/language-nav" links=Header.language_nav.links /}
+                    {>"ui/menu/language-nav" links=Header.language_nav.links id="lang-menu" /}
                 </div>
             {/Header.lang_nav_horizontal}
 
             {?Header.lang_nav_horizontal}
                 <div class="is-hidden-desktop">
                     {?Header.language_nav.links_without_current}
-                        {>"ui/menu/language-nav" links=Header.language_nav.links_without_current /}
+                        {>"ui/menu/language-nav" links=Header.language_nav.links_without_current id="lang-menu-mobile" /}
                     {:else}
                         {>"ui/menu/language-nav-dropdown" links=Header.language_nav.links /}
                     {/Header.language_nav.links_without_current}
diff --git a/partials/ui/menu/language-nav.dust b/partials/ui/menu/language-nav.dust
index 448e38f4..cdf6cb1a 100644
--- a/partials/ui/menu/language-nav.dust
+++ b/partials/ui/menu/language-nav.dust
@@ -1,6 +1,6 @@
 {?links.all}
     <nav aria-label="{Strings.s.header.language_navigation|s}">
-        <ul id="lang-menu"
+        <ul id="{id|attr}"
             class="lang-nav--horizontal ml-6-desktop is-flex is-unstyled is-uppercase has-text-weight-semibold is-family-secondary">
             {#links.all}
                 <li class="ml-2-desktop">
diff --git a/partials/ui/menu/menu-item-dropdown.dust b/partials/ui/menu/menu-item-dropdown.dust
index 1b448228..95de5f18 100644
--- a/partials/ui/menu/menu-item-dropdown.dust
+++ b/partials/ui/menu/menu-item-dropdown.dust
@@ -6,12 +6,12 @@
     <li class="navbar-item has-dropdown {#classes}{.}{@sep} {/sep}{/classes}">
         <div class="navbar-dropdown-control">
             <a class="navbar-link dropdown-trigger is-arrowless" href="#">
-                {title|s}
+                {title|html}
             </a>
 
-            <button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-dropdown-{$idx}">
-                <span class="is-sr-only">{data.open_menu|s}</span>
-                {Strings.s}
+            <button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-dropdown-{$idx|attr}">
+                <span class="is-sr-only">{data.open_menu|html}</span>
+                {Strings.s|html}
 
                 <span aria-hidden="true">
                     {>"ui/icon" icon="chevron-down" class="icon--medium" /}
@@ -20,6 +20,6 @@
         </div>
 
         {>"ui/menu/menu-item-dropdown-content" /}
-       
+
     </li>
 {/sub_menu}
diff --git a/partials/ui/menu/menu-item.dust b/partials/ui/menu/menu-item.dust
index a5264bd3..288c932f 100644
--- a/partials/ui/menu/menu-item.dust
+++ b/partials/ui/menu/menu-item.dust
@@ -5,12 +5,12 @@
 {?sub_menu}
     <li class="navbar-item has-dropdown {#classes}{.}{@sep} {/sep}{/classes}">
         <div class="navbar-dropdown-control">
-            <a class="navbar-link is-arrowless" href="{url}">
-                {title|s}
+            <a class="navbar-link is-arrowless" href="{url|url}">
+                {title|html}
             </a>
 
-            <button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-{$idx}">
-                <span class="is-sr-only">{data.open_menu|s}</span>
+            <button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-{$idx|attr}">
+                <span class="is-sr-only">{data.open_menu|html}</span>
 
                 <span aria-hidden="true">
                     {>"ui/icon" icon="chevron-down" class="icon--medium" /}
@@ -18,7 +18,7 @@
             </button>
         </div>
 
-        <div class="navbar-dropdown is-hidden-touch" id="js-navbar-menu-item-{$idx}">
+        <div class="navbar-dropdown is-hidden-touch" id="js-navbar-menu-item-{$idx|attr}">
             {#sub_menu}
                 {>"ui/menu/menu-item-simple" /}
             {/sub_menu}