diff --git a/phpmyfaq/assets/src/configuration/update.js b/phpmyfaq/assets/src/configuration/update.js
index 811d7a9a5b..8e9a57aa1b 100644
--- a/phpmyfaq/assets/src/configuration/update.js
+++ b/phpmyfaq/assets/src/configuration/update.js
@@ -125,7 +125,17 @@ export const handleDatabaseUpdate = async () => {
           alert.classList.remove('d-none');
           return;
         } else {
-          const value = JSON.parse(decodedValue);
+          let value;
+          try {
+            value = JSON.parse(decodedValue);
+          } catch (error) {
+            console.error('Failed to parse JSON:', error);
+            const alert = document.getElementById('phpmyfaq-update-database-error');
+            const errorMessage = document.getElementById('error-messages');
+            alert.classList.remove('d-none');
+            errorMessage.innerText = `Error: ${error.message}\nFull Error: ${decodedValue}`;
+            return;
+          }
           if (value.progress) {
             progressBarInstallation.style.width = value.progress;
             progressBarInstallation.innerText = value.progress;
@@ -147,14 +157,10 @@ export const handleDatabaseUpdate = async () => {
 
       await pump();
     } catch (error) {
-      const errorMessage =
-        error.cause && error.cause.response
-          ? await error.cause.response.json()
-          : { error: 'Unknown database error during update.' };
+      console.error('Error details:', error);
       const alert = document.getElementById('phpmyfaq-update-database-error');
-
       alert.classList.remove('d-none');
-      alert.innerHTML = errorMessage.error;
+      alert.innerText = `Error: ${error.message}`;
     }
   }
 };
diff --git a/phpmyfaq/assets/templates/setup/index.twig b/phpmyfaq/assets/templates/setup/index.twig
index 2eb7dfb0e2..ca24a59fae 100644
--- a/phpmyfaq/assets/templates/setup/index.twig
+++ b/phpmyfaq/assets/templates/setup/index.twig
@@ -1,4 +1,4 @@
-{% extends 'setup/base.twig' %}
+{% extends '@setup/base.twig' %}
 
 {% block content %}
   <main role="main">
diff --git a/phpmyfaq/assets/templates/setup/update.twig b/phpmyfaq/assets/templates/setup/update.twig
index 2f4aaf337b..10dea21394 100644
--- a/phpmyfaq/assets/templates/setup/update.twig
+++ b/phpmyfaq/assets/templates/setup/update.twig
@@ -54,7 +54,7 @@
             <span class="stepIndicator">Database updates</span>
           </div>
 
-          {{ include('./setup/update/step' ~ currentStep ~ '.twig') }}
+          {{ include('@setup/update/step' ~ currentStep ~ '.twig') }}
 
           {% if checkBasicError %}
             <div class="alert alert-danger my-5" role="alert">
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Frontend/SetupController.php b/phpmyfaq/src/phpMyFAQ/Controller/Frontend/SetupController.php
index 86aab283ae..8bc1a17aa2 100644
--- a/phpmyfaq/src/phpMyFAQ/Controller/Frontend/SetupController.php
+++ b/phpmyfaq/src/phpMyFAQ/Controller/Frontend/SetupController.php
@@ -57,7 +57,7 @@ public function index(Request $request): Response
         }
 
         return $this->render(
-            'setup/index.twig',
+            '@setup/index.twig',
             [
                 'newVersion' => System::getVersion(),
                 'setupType' => 'Setup',
@@ -95,7 +95,7 @@ public function install(): Response
         }
 
         return $this->render(
-            'setup/install.twig',
+            '@setup/install.twig',
             [
                 'newVersion' => System::getVersion(),
                 'setupType' => 'Setup',
@@ -128,7 +128,7 @@ public function update(Request $request): Response
         }
 
         return $this->render(
-            'setup/update.twig',
+            '@setup/update.twig',
             [
                 'currentStep' => $currentStep ?? 1,
                 'installedVersion' => $configuration->getVersion(),
diff --git a/phpmyfaq/src/phpMyFAQ/Template/TwigWrapper.php b/phpmyfaq/src/phpMyFAQ/Template/TwigWrapper.php
index 3e66dae2a4..61b9cf1094 100644
--- a/phpmyfaq/src/phpMyFAQ/Template/TwigWrapper.php
+++ b/phpmyfaq/src/phpMyFAQ/Template/TwigWrapper.php
@@ -50,6 +50,7 @@ public function __construct(string $templatePath, bool $isSetup = false)
         $filesystemLoader = new FilesystemLoader();
         $filesystemLoader->addPath($templatePath . '/' . self::$templateSetName);
         $filesystemLoader->addPath($templatePath . '/admin', 'admin');
+        $filesystemLoader->addPath($templatePath . '/setup', 'setup');
         $this->twigEnvironment = new Environment(
             $filesystemLoader,
             [