diff --git a/actions/showstream.php b/actions/showstream.php
index 3fe71576d7..3882af8451 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -288,7 +288,7 @@ class ShowstreamAction extends Action
         if (count($tags) > 0) {
             $this->elementStart('dl', 'user_tags');
             $this->element('dt', null, _('Tags'));
-            $this->elementStart('dd', 'tags');
+            $this->elementStart('dd');
             $this->elementStart('ul', 'tags xoxo');
             foreach ($tags as $tag) {
                 $this->elementStart('li');
diff --git a/lib/profilelist.php b/lib/profilelist.php
index b2a9925c10..f7ed5d19c6 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -156,8 +156,7 @@ class ProfileList extends Widget
             # Get tags
             $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
 
-            $this->out->elementStart('div', 'tags_user');
-            $this->out->elementStart('dl');
+            $this->out->elementStart('dl', 'user_tags');
             $this->out->elementStart('dt');
             if ($user->id == $this->owner->id) {
                 $this->out->element('a', array('href' => common_local_url('tagother',
@@ -166,13 +165,13 @@ class ProfileList extends Widget
             } else {
                 $this->out->text(_('Tags'));
             }
-            $this->out->text(":");
             $this->out->elementEnd('dt');
             $this->out->elementStart('dd');
             if ($tags) {
                 $this->out->elementStart('ul', 'tags xoxo');
                 foreach ($tags as $tag) {
                     $this->out->elementStart('li');
+                    $this->element('span', 'mark_hash', '#');
                     $this->out->element('a', array('rel' => 'tag',
                                               'href' => common_local_url($this->action,
                                                                          array('nickname' => $this->owner->nickname,
@@ -186,7 +185,6 @@ class ProfileList extends Widget
             }
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
-            $this->out->elementEnd('div');
         }
 
         if ($user && $user->id == $this->owner->id) {