diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index e47d25f..6030957 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -188,12 +188,16 @@ final class ApiController extends Controller
                 ReferenceMapper::create()->execute($ref);
 
                 if ($collection === null) {
-                    $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
-                        '/Modules/Media/Files',
-                        $accountPath,
-                        $request->header->account,
-                        __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId()
-                    );
+                    $collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
+
+                    if ($collection instanceof NullMedia) {
+                        $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
+                            '/Modules/Media/Files',
+                            $accountPath,
+                            $request->header->account,
+                            __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId()
+                        );
+                    }
                 }
 
                 CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());
@@ -214,12 +218,16 @@ final class ApiController extends Controller
                 ReferenceMapper::create()->execute($ref);
 
                 if ($collection === null) {
-                    $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
-                        '/Modules/Media/Files',
-                        $path,
-                        $request->header->account,
-                        __DIR__ . '/../../../Modules/Media/Files' . $path
-                    );
+                    $collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
+
+                    if ($collection instanceof NullMedia) {
+                        $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
+                            '/Modules/Media/Files',
+                            $path,
+                            $request->header->account,
+                            __DIR__ . '/../../../Modules/Media/Files' . $path
+                        );
+                    }
                 }
 
                 CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());
diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php
index 341373d..fe9bb5d 100755
--- a/Theme/Backend/news-dashboard.tpl.php
+++ b/Theme/Backend/news-dashboard.tpl.php
@@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?>
                 <?= !($isSeen = \in_array($news->getId(), $seen)) ? '<strong>' : ''; ?>
                     <a href="<?= $url; ?>"><?= $this->printHtml($news->title); ?></a>
                     <span class="floatRight">
-                        <a class="content" href="<?= $profile; ?>"><?= $this->printHtml($news->createdBy->name3 . ' ' . $news->createdBy->name2 . ' ' . $news->createdBy->name1); ?>
+                        <a class="content" href="<?= $profile; ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$news->createdBy->name1, $news->createdBy->name2, $news->createdBy->name3, $news->createdBy->login ?? ''])); ?>
                         </a> - <?= $news->publish->format('Y-m-d'); ?>
                     </span>
                 <?= !$isSeen ? '</strong>' : ''; ?>
diff --git a/Theme/Backend/news-single.tpl.php b/Theme/Backend/news-single.tpl.php
index 3422970..71aa65f 100755
--- a/Theme/Backend/news-single.tpl.php
+++ b/Theme/Backend/news-single.tpl.php
@@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <section class="portlet">
             <article>
-                <h1><?= $this->printHtml($news->title); ?><span class="floatRight"><a href="<?= $profile; ?>"><?= $this->printHtml($news->createdBy->name3 . ' ' . $news->createdBy->name2 . ' ' . $news->createdBy->name1); ?></a> - <?= $news->publish->format('Y-m-d'); ?></span></h1>
+                <h1><?= $this->printHtml($news->title); ?><span class="floatRight"><a href="<?= $profile; ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$news->createdBy->name1, $news->createdBy->name2, $news->createdBy->name3, $news->createdBy->login ?? ''])); ?></a> - <?= $news->publish->format('Y-m-d'); ?></span></h1>
                 <?= $news->content; ?>
             </article>
             <?php if ($editable || !empty($tags)) : ?>