diff --git a/Classes/Controller/PostController.php b/Classes/Controller/PostController.php
index d7034fd2..0daf7c75 100644
--- a/Classes/Controller/PostController.php
+++ b/Classes/Controller/PostController.php
@@ -255,9 +255,7 @@ public function listPostsByCategoryAction(Category $category = null)
      */
     public function listPostsByAuthorAction(Author $author = null)
     {
-        if (null === $author) {
-            $this->view->assign('authors', $this->authorRepository->findAll());
-        } else {
+        if ($author) {
             $posts = $this->postRepository->findAllByAuthor($author);
             $this->view->assign('posts', $posts);
             $this->view->assign('author', $author);
@@ -266,6 +264,8 @@ public function listPostsByAuthorAction(Author $author = null)
             foreach ($posts as $post) {
                 $this->blogCacheService->addTagsForPost($post);
             }
+        } else {
+            $this->view->assign('authors', $this->authorRepository->findAll());
         }
     }
 
diff --git a/Resources/Private/Templates/Post/ListPostsByAuthor.html b/Resources/Private/Templates/Post/ListPostsByAuthor.html
index 82420906..c9da321f 100644
--- a/Resources/Private/Templates/Post/ListPostsByAuthor.html
+++ b/Resources/Private/Templates/Post/ListPostsByAuthor.html
@@ -2,23 +2,21 @@
 <f:layout name="Default" />
 
 <f:section name="content">
-    <f:if condition="{authors}">
+    <f:if condition="{author}">
         <f:then>
-            <f:comment>In case authors is set, to special author is in request and we show all authors as links.</f:comment>
+            <h1 class="page-title"><f:translate key="headline.author" arguments="{0: author.name}" /> <blog:link.author rss="true" author="{author}"><i class="fa fa-rss-square"></i></blog:link.author></h1>
+            <div class="taxonomy-description">
+                <p>{author.bio}</p>
+            </div>
+            <f:render partial="List" arguments="{_all}" />
+        </f:then>
+        <f:else>
             <h1 class="page-title"><f:translate key="headline.authors" /></h1>
             <ul class="list-inline">
                 <f:for each="{authors}" as="author">
                     <li><blog:link.author author="{author}" /></li>
                 </f:for>
             </ul>
-        </f:then>
-        <f:else>
-            <f:comment>In case authors is NOT set, a special author is in request and we show all blogs posts of this author.</f:comment>
-            <h1 class="page-title"><f:translate key="headline.author" arguments="{0: author.name}" /> <blog:link.author rss="true" author="{author}"><i class="fa fa-rss-square"></i></blog:link.author></h1>
-            <div class="taxonomy-description">
-                <p>{author.bio}</p>
-            </div>
-            <f:render partial="List" arguments="{_all}" />
         </f:else>
     </f:if>
 </f:section>