diff --git a/lib/peopletagswidget.php b/lib/peopletagswidget.php
index 1da153c85f..31c279cbff 100644
--- a/lib/peopletagswidget.php
+++ b/lib/peopletagswidget.php
@@ -103,8 +103,8 @@ class PeopletagsWidget extends Widget
             $this->out->elementStart('li', 'hashptag mode-' . $mode);
             // Avoid space by using raw output.
             $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
-              $this->url($this->tag->tag) .
-              '">' . $this->tag->tag . '</a>';
+              htmlspecialchars($this->url()) .
+              '">' . htmlspecialchars($this->tag->tag) . '</a>';
             $this->out->raw($pt);
             $this->out->elementEnd('li');
         }
diff --git a/lib/selftagswidget.php b/lib/selftagswidget.php
index e2530769df..aff4544c0d 100644
--- a/lib/selftagswidget.php
+++ b/lib/selftagswidget.php
@@ -29,10 +29,10 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class SelftagsWidget extends PeopletagsWidget
 {
-    function url($tag)
+    public function url()
     {
         // link to self tag page
-        return common_local_url('selftag', array('tag' => $tag));
+        return common_local_url('selftag', array('tag' => $this->tag->tag));
     }
 
     function label()