diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index a72e38f..8e60eaf 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -301,10 +301,11 @@ final class ApiController extends Controller
                 null,
                 PermissionType::READ | PermissionType::MODIFY | PermissionType::DELETE | PermissionType::PERMISSION,
             ),
-            $request->getHeader()->getAccount()
+            $request->getHeader()->getAccount(),
+            $request->getOrigin()
         );
 
-        $this->createModel($request->getHeader()->getAccount(), $template, TemplateMapper::class, 'template');
+        $this->createModel($request->getHeader()->getAccount(), $template, TemplateMapper::class, 'template', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Template', 'Template successfully created', $template);
     }
 
@@ -403,10 +404,11 @@ final class ApiController extends Controller
                 null,
                 PermissionType::READ | PermissionType::MODIFY | PermissionType::DELETE | PermissionType::PERMISSION,
             ),
-            $request->getHeader()->getAccount()
+            $request->getHeader()->getAccount(),
+            $request->getOrigin()
         );
 
-        $this->createModel($request->getHeader()->getAccount(), $report, ReportMapper::class, 'report');
+        $this->createModel($request->getHeader()->getAccount(), $report, ReportMapper::class, 'report', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Report', 'Report successfully created', $report);
     }
 
diff --git a/Theme/Backend/helper-edit.tpl.php b/Theme/Backend/helper-edit.tpl.php
index fc8a812..8c8143a 100644
--- a/Theme/Backend/helper-edit.tpl.php
+++ b/Theme/Backend/helper-edit.tpl.php
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
         <div class="bc-1">
             <ul class="l-1">
                 <li>
-                    <a href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}helper/single?{?}&id=' . $this->getData('name')); ?>"
+                    <a tabindex="0" href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}helper/single?{?}&id=' . $this->getData('name')); ?>"
                        class="button"><?= $this->getHtml('Report') ?></a>
             </ul>
         </div>
diff --git a/Theme/Backend/helper-list.tpl.php b/Theme/Backend/helper-list.tpl.php
index 0b6fc3c..b808e9f 100644
--- a/Theme/Backend/helper-list.tpl.php
+++ b/Theme/Backend/helper-list.tpl.php
@@ -54,8 +54,8 @@ echo $this->getData('nav')->render(); ?>
                         <?php endforeach; ?>
             </table>
             <div class="portlet-foot">
-                <a class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
-                <a class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
             </div>
         </div>
     </div>
diff --git a/Theme/Backend/helper-single.tpl.php b/Theme/Backend/helper-single.tpl.php
index da4fdad..aed701f 100644
--- a/Theme/Backend/helper-single.tpl.php
+++ b/Theme/Backend/helper-single.tpl.php
@@ -81,7 +81,7 @@ echo $this->getData('nav')->render(); ?>
 
                                 </select>
                         <tr>
-                            <td><a target="_blank" class="button" href="<?= UriFactory::build('{/api}helper/report/export?{?}'); ?>&type={#iExport}&lang={#iLang}{#iUiSettings}"><?= $this->getHtml('Export'); ?></a>
+                            <td><a tabindex="0" target="_blank" class="button" href="<?= UriFactory::build('{/api}helper/report/export?{?}'); ?>&type={#iExport}&lang={#iLang}{#iUiSettings}"><?= $this->getHtml('Export'); ?></a>
                     </table>
                 </form>
             </div>
@@ -100,7 +100,7 @@ echo $this->getData('nav')->render(); ?>
                         <?php endforeach; ?>
                     </table>
                 </div>
-                <div class="portlet-foot"><a class="button" href="<?= UriFactory::build('{%}');?>&type={#iExport}&lang={#iLang}{#iUiSettings}"><?= $this->getHtml('Load'); ?></a></div>
+                <div class="portlet-foot"><a tabindex="0" class="button" href="<?= UriFactory::build('{%}');?>&type={#iExport}&lang={#iLang}{#iUiSettings}"><?= $this->getHtml('Load'); ?></a></div>
             </form>
         </div>
         <?php endif; ?>