diff --git a/app/models/tag_subscription.rb b/app/models/tag_subscription.rb
index 270b3774a..110f4e26c 100644
--- a/app/models/tag_subscription.rb
+++ b/app/models/tag_subscription.rb
@@ -12,6 +12,10 @@ class TagSubscription < ActiveRecord::Base
     self.name = name.gsub(/\W/, "_")
   end
   
+  def pretty_name
+    name.tr("_", " ")
+  end
+  
   def initialize_creator
     self.creator_id = CurrentUser.id
   end
diff --git a/app/views/tag_subscriptions/index.html.erb b/app/views/tag_subscriptions/index.html.erb
index c91e11320..edef650fd 100644
--- a/app/views/tag_subscriptions/index.html.erb
+++ b/app/views/tag_subscriptions/index.html.erb
@@ -4,7 +4,6 @@
     <table class="striped" width="100%">
       <thead>
         <tr>
-          <th>Creator</th>
           <th>Name</th>
           <th>Tag Query</th>
           <% if CurrentUser.is_admin? %>
@@ -16,8 +15,7 @@
       <tbody>
         <% @tag_subscriptions.each do |tag_subscription| %>
           <tr>
-            <td><%= link_to tag_subscription.creator.name, user_path(tag_subscription.creator_id) %></td>
-            <td><%= tag_subscription.name %></td>
+            <td><%= tag_subscription.pretty_name %></td>
             <td><%= tag_subscription.tag_query %></td>
             <td><%= tag_subscription.post_id_array.size %></td>
             <td>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 2f80b6a7e..f8e18f5d9 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -34,7 +34,7 @@
           <h2>Subscriptions</h2>
           <% @presenter.subscriptions.each do |subscription| %>
             <div class="box">
-              <h3><%= link_to subscription.name, posts_path(:tags => "sub:#{@user.name}:#{subscription.name}") %></h3>
+              <h3><%= link_to subscription.pretty_name, posts_path(:tags => "sub:#{@user.name}:#{subscription.name}") %></h3>
               
               <div>
                 <% @presenter.posts_for_subscription(subscription).each do |post| %>