diff --git a/lib/rsslib.php b/lib/rsslib.php
index dcc3c419bc2..0129a118d6c 100644
--- a/lib/rsslib.php
+++ b/lib/rsslib.php
@@ -16,11 +16,17 @@ function rss_get_link($courseid, $userid, $modulename, $id, $tooltiptext='') {
     }
 
     if ($CFG->slasharguments) {
-        $rsspath = "$CFG->wwwroot/rss/file.php/$courseid/$userid/$modulename/$id/rss.xml";
+        $rsspath = "$CFG->wwwroot/rss/file.php/$courseid";
     } else {
-        $rsspath = "$CFG->wwwroot/rss/file.php?file=/$courseid/$userid/$modulename/$id/rss.xml";
+        $rsspath = "$CFG->wwwroot/rss/file.php?file=/$courseid";
     }
-
+    if (!empty($userid)) {
+        $rsspath .= "/$userid/$modulename/$id/rss.xml";
+    }
+    else {
+        $rsspath .= "/$modulename/$id/rss.xml";
+    }
+    
     $rsspix = $CFG->pixpath .'/i/rss.gif';
 
     return '<a href="'. $rsspath .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="" /></a>';