diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 4ffae2856..96d87cc12 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -26,6 +26,11 @@
         <% end %>
         
         <%= f.input :blacklisted_tags, :hint => "Put any tag combinations you never want to see here. Each combination should go on a separate line.", :input_html => {:size => "40x5"} %>
+        <div class="input text optional field_with_hint">
+          <label class="text optional" for="user_favorite_tags">Favorite tags</label>
+          <textarea id="user_favorite_tags" class="text optional" rows="5" name="user[favorite_tags]" cols="40"><%= raw @user.favorite_tags %></textarea>
+          <span class="hint">A list of whitespace delimited tags that show up in your profile. <%= link_to "Restore from old database", restore_uploaded_tags_user_path(@user), :method => :post, :remote => true %></span>
+        </div> 
       </fieldset>
       
       <fieldset>