diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 28561a4aefacb5ea7f0e3ca4d2c2a82a2f85683e..68367d0bd969b0d223bbf5af0432cc01d49e2c44 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -30,6 +30,7 @@ sb        http://www.splitbrain.org/go/
 skype     skype:{NAME}
 google.de http://www.google.de/search?q=
 go        http://www.google.com/search?q={URL}&btnI=lucky
+user      wiki:users:{URL}
 
 # To support VoIP/SIP links
 callto    callto://{NAME}
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 80701cd2ebc6711aefb875ddc73dc6e018e00092..fbdd8ada634cf166074c76fe2daa38fbb4760f38 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -699,6 +699,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         //get interwiki URL
         $url = $this->_resolveInterWiki($wikiName,$wikiUri);
 
+        if(strpos($url,'/') === false) {
+            list($url, $urlparam) = explode('?', $url, 2);
+            $url = wl($url, $urlparam);
+        }
+
         if ( !$isImage ) {
             $class = preg_replace('/[^_\-a-z0-9]+/i','_',$wikiName);
             $link['class'] = "interwiki iw_$class";