diff --git a/app/includes/feedback-show.php b/app/includes/feedback-show.php
index f9020d3..0fced2d 100644
--- a/app/includes/feedback-show.php
+++ b/app/includes/feedback-show.php
@@ -1,7 +1,14 @@
 <?php
-if (isset($messages) && is_array($messages)) {
-    foreach ($messages as $msg) {
-        echo Feedback::render($msg['category'], $msg['key'], $msg['custom_message'] ?? null, $msg['dismissible'] ?? false, $msg['small'] ?? false);
+
+if (isset($system_messages) && is_array($system_messages)) {
+    foreach ($system_messages as $msg) {
+        echo Feedback::render(
+            $msg['category'],
+            $msg['key'],
+            $msg['custom_message'] ?? null,
+            $msg['dismissible'] ?? false,
+            $msg['small'] ?? false
+        );
     }
 }
 
diff --git a/app/templates/page-header.php b/app/templates/page-header.php
index 9ea9435..1d09c26 100644
--- a/app/templates/page-header.php
+++ b/app/templates/page-header.php
@@ -45,8 +45,8 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col">
-                <?php if (isset($messages) && is_array($messages)): ?>
-                    <?php foreach ($messages as $msg): ?>
+                <?php if (isset($system_messages) && is_array($system_messages)): ?>
+                    <?php foreach ($system_messages as $msg): ?>
                         <?= Feedback::render($msg['category'], $msg['key'], $msg['custom_message'] ?? null) ?>
                     <?php endforeach; ?>
                 <?php endif; ?>