diff --git a/library/Class/CodifAuteur.php b/library/Class/CodifAuteur.php
index 759737f2bb8b51045cb95e27a782ff6f6cd937f8..b6b0c088d0a75a3c83412d913eedd0c04c65ce1c 100644
--- a/library/Class/CodifAuteur.php
+++ b/library/Class/CodifAuteur.php
@@ -21,6 +21,25 @@
 
 
 class CodifAuteurLoader extends Storm_Model_Loader {
+  public function findWithFullName($author) {
+    if(!$author)
+      return null;
+
+    $indexation = new Class_Indexation();
+    $alpha_author = $indexation->alphaMaj($author);
+
+    if(1 == count(($names = explode(' ', $author))))
+      return Class_CodifAuteur::findByCodeAlpha($alpha_author);
+
+    if(2 < count($names))
+      return Class_CodifAuteur::findFirstBy(['libelle' => $alpha_author]);
+
+    return ($found = Class_CodifAuteur::findByLastNameFirstName($names[0], $names[1]))
+      ? $found
+      : Class_CodifAuteur::findByLastNameFirstName($names[1], $names[0]);
+  }
+
+
   public function findByLastNameFirstName($lastname, $firstname) {
     $code_alpha = str_replace(' ',
                               'x',
diff --git a/library/ZendAfi/View/Helper/AuthorAnchor.php b/library/ZendAfi/View/Helper/AuthorAnchor.php
index c0fe579e12b2d799806a8eee55d90ecc1dff84c1..73d83fa71216180257a7c0d11a4b7369be0342c9 100644
--- a/library/ZendAfi/View/Helper/AuthorAnchor.php
+++ b/library/ZendAfi/View/Helper/AuthorAnchor.php
@@ -26,13 +26,11 @@ class ZendAfi_View_Helper_AuthorAnchor extends ZendAfi_View_Helper_BaseHelper {
     if(!$author)
       return '';
 
-    if(!$facet = Class_CodifAuteur::findFirstBy(['libelle' => (new Class_Indexation())->alphaMaj($author)]))
-      return $author;
-
-    $params = array_merge(['controller' => 'recherche',
-                           'action' => 'simple',
-                           'facette' => Class_CodifAuteur::CODE_FACETTE . $facet->getId()],
-                          $params);
+    if($facet = Class_CodifAuteur::findWithFullName($author))
+      $params = array_merge(['controller' => 'recherche',
+                             'action' => 'simple',
+                             'facette' => Class_CodifAuteur::CODE_FACETTE . $facet->getId()],
+                            $params);
 
     return $this->view->tagAnchor($this->view->url($params, null, true),
                                   $author);
diff --git a/tests/library/ZendAfi/View/Helper/AuthorAnchorTest.php b/tests/library/ZendAfi/View/Helper/AuthorAnchorTest.php
index 0cb81ecc94fda2bc9c75a9791c708135eb85828b..6b508ab7d5d640b7864e72739a0f62bd3557f32f 100644
--- a/tests/library/ZendAfi/View/Helper/AuthorAnchorTest.php
+++ b/tests/library/ZendAfi/View/Helper/AuthorAnchorTest.php
@@ -27,13 +27,26 @@ class ZendAfi_View_Helper_AnchorAuthorSimpleTest extends ViewHelperTestCase {
   public function setup() {
     parent::setUp();
 
-    $this->fixture('Class_CodifAuteur',
-                   ['id' => 10,
-                    'libelle' => 'STEPHANIE BRISSON']);
+    $brisson = $this->fixture('Class_CodifAuteur',
+                              ['id' => 10,
+                               'libelle' => 'Stéphanie BRISSON',
+                               'formes' => 'BRISSONxSTEPHANIE']);
+
+    $kondu = $this->fixture('Class_CodifAuteur',
+                            ['id' => 11,
+                             'libelle' => 'Marie Kond?',
+                             'formes' => 'KONDxxMARIE']);
+
+    $this->onLoaderOfModel('Class_CodifAuteur')
+
+         ->whenCalled('findByLastNameFirstName')
+         ->with('Stéphanie', 'BRISSON')
+         ->answers($brisson)
+
+         ->whenCalled('findByLastNameFirstName')
+         ->with('Marie', 'Kondō')
+         ->answers($kondu);
 
-    $this->fixture('Class_CodifAuteur',
-                   ['id' => 11,
-                    'libelle' => 'MARIE KOND?']);
 
     $this->_helper = new ZendAfi_View_Helper_AuthorAnchor();
     $this->_helper->setView(new ZendAfi_Controller_Action_Helper_View());
@@ -47,8 +60,7 @@ class ZendAfi_View_Helper_AnchorAuthorSimpleTest extends ViewHelperTestCase {
 
 
   /** @test */
-  public function shouldNotReturnAnchor() {
-    $this->assertEquals('Marie Kondō', $this->_helper->authorAnchor('Marie Kondō'));
+  public function shouldReturnAnchorWithFacetA11() {
+    $this->assertContains('/recherche/simple/facette/A11">Marie Kondō</a>', $this->_helper->authorAnchor('Marie Kondō'));
   }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file