diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php
index fcef0d1..4c227a9 100644
--- a/Theme/Backend/task-create.tpl.php
+++ b/Theme/Backend/task-create.tpl.php
@@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
             <header><h1><?= $this->getText('Task'); ?></h1></header>
 
             <div class="inner">
-                <form id="fTask" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task?csrf={$CSRF}'); ?>">
+                <form id="fTask" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task?{?}csrf={$CSRF}'); ?>">
                     <table class="layout wf-100">
                         <tbody>
                         <tr><td colspan="2"><label for="iReceiver"><?= $this->getText('To'); ?></label>
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index a23365b..bbe8ef4 100644
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?>
                 <tfoot>
                 <tbody>
                 <?php $c = 0; foreach($tasks as $key => $task) : $c++;
-                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/task/single?{?}&id=' . $task->getId());
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/task/single?{?{?}}&id=' . $task->getId());
                 $color = 'darkred';
                 if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
                 elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 20fcbad..d229fff 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -86,7 +86,7 @@ echo $this->getData('nav')->render(); ?>
 
         <section class="box wf-100">
             <div class="inner">
-                <form id="taskElementCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task/element?csrf={$CSRF}'); ?>">
+                <form id="taskElementCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task/element?{?}csrf={$CSRF}'); ?>">
                     <table class="layout wf-100">
                         <tr><td><label for="iMessage"><?= $this->getText('Message'); ?></label>
                         <tr><td><textarea id="iMessage" name="description"></textarea>