diff --git a/internal/template/templates/common/layout.html b/internal/template/templates/common/layout.html
index 50cab8a7..9bebd59a 100644
--- a/internal/template/templates/common/layout.html
+++ b/internal/template/templates/common/layout.html
@@ -116,10 +116,10 @@
         <search role="search" class="search">
             <details {{ if $.searchQuery }}open{{ end }}>
                 <summary>
-                    <span id="search-label">{{ t "search.label" }}</span>
+                    <span>{{ t "search.label" }}</span>
                 </summary>
                 <form action="{{ route "searchEntries" }}" aria-labelledby="search-input-label">
-                    <input type="search" name="q" aria-labelledby="search-label" {{ if $.searchQuery }}value="{{ .searchQuery }}"{{ end }} required>
+                    <input type="search" name="q" aria-label="{{ t "search.label" }}" {{ if $.searchQuery }}value="{{ .searchQuery }}"{{ end }} required>
                     <button type="submit">{{ t "search.submit" }}</button>
                 </form>
             </details>
diff --git a/internal/template/templates/views/login.html b/internal/template/templates/views/login.html
index 133ea743..3a9a3f82 100644
--- a/internal/template/templates/views/login.html
+++ b/internal/template/templates/views/login.html
@@ -1,5 +1,8 @@
 {{ define "title"}}{{ t "page.login.title" }}{{ end }}
 
+
+{{ define "header"}}{{ end }}
+
 {{ define "content"}}
 <section class="login-form">
     <form action="{{ route "checkLogin" }}" method="post">