diff --git a/handlers/manage-apikeys.go b/handlers/manage-apikeys.go
index d837668..a7dcee8 100644
--- a/handlers/manage-apikeys.go
+++ b/handlers/manage-apikeys.go
@@ -11,7 +11,7 @@ import (
 
 func ManageAPIKeys() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
diff --git a/handlers/manage-user.go b/handlers/manage-user.go
index 9fc9a3b..49ef63e 100644
--- a/handlers/manage-user.go
+++ b/handlers/manage-user.go
@@ -18,7 +18,7 @@ import (
 
 func ManageUsers() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
@@ -159,7 +159,7 @@ func ManageUsers() echo.HandlerFunc {
 
 func CreateUser() echo.HandlerFunc { //nolint:gocognit
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
@@ -270,7 +270,7 @@ func CreateUser() echo.HandlerFunc { //nolint:gocognit
 
 func ViewUser() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
@@ -407,7 +407,7 @@ func ViewUser() echo.HandlerFunc {
 //nolint:dupl
 func EditUser() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
@@ -509,7 +509,7 @@ func EditUser() echo.HandlerFunc {
 //nolint:dupl
 func UpdateUser() echo.HandlerFunc { //nolint:gocognit
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
@@ -745,7 +745,7 @@ func UpdateUser() echo.HandlerFunc { //nolint:gocognit
 // DeleteUserConfirmation displays user deletion confirmation confirmation page.
 func DeleteUserConfirmation() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
@@ -846,7 +846,7 @@ func DeleteUserConfirmation() echo.HandlerFunc {
 // DeleteUser handles user deletion POST requests.
 func DeleteUser() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
diff --git a/handlers/search-hibp.go b/handlers/search-hibp.go
index f40eec8..c3951d6 100644
--- a/handlers/search-hibp.go
+++ b/handlers/search-hibp.go
@@ -17,7 +17,7 @@ import (
 
 func GetSearchHIBP() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
@@ -92,7 +92,7 @@ func GetSearchHIBP() echo.HandlerFunc {
 
 func SearchHIBP() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
diff --git a/handlers/user-init-password-change.go b/handlers/user-init-password-change.go
index 94bc891..544cc0a 100644
--- a/handlers/user-init-password-change.go
+++ b/handlers/user-init-password-change.go
@@ -15,7 +15,7 @@ import (
 
 func InitialPasswordChangePost() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
@@ -136,7 +136,7 @@ func InitialPasswordChangePost() echo.HandlerFunc {
 
 func InitialPasswordChange() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {
diff --git a/handlers/view-hibp.go b/handlers/view-hibp.go
index 54dbfcc..6c78818 100644
--- a/handlers/view-hibp.go
+++ b/handlers/view-hibp.go
@@ -14,7 +14,7 @@ import (
 
 func ViewHIBP() echo.HandlerFunc {
 	return func(c echo.Context) error {
-		addHeaders(c)
+		defer addHeaders(c)
 
 		u, ok := c.Get("sessUsr").(moduser.User)
 		if !ok {