1 files changed, 4 insertions, 1 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index dba7cb426..5b5716a3f 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -428,8 +428,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         global $conf;
         global $ID;
 
-        $name = $this->_getLinkTitle($name, $this->_simpleTitle($id), $isImage, $id);
+        // default name is based on $id as given
+        $default = $this->_simpleTitle($id);
+        // now first resolve and clean up the $id
         resolve_pageid(getNS($ID),$id,$exists);
+        $name = $this->_getLinkTitle($name, $default, $isImage, $id);
         if ( !$isImage ) {
             if ( $exists ) {
                 $class='wikilink1';