diff --git a/Allura/allura/templates/user_prefs.html b/Allura/allura/templates/user_prefs.html
index bd593ab..74d5c08 100644
--- a/Allura/allura/templates/user_prefs.html
+++ b/Allura/allura/templates/user_prefs.html
@@ -32,6 +32,7 @@
     <fieldset class="preferences">
       <legend>Username: {{ c.user.username }}</legend>
       <p><a href="{{ c.user.private_project().url() }}">My profile and my projects</a></p>
+      <p><a href="{{ c.user.url() }}activity/">Activity I follow</a></p>
       <p><a href="{{ c.user.private_project().url() }}admin/overview">Set avatar icon</a></p>
       {% if h.asbool(tg.config.get('auth.allow_user_to_disable_account', False)) %}
         <p><a href="/auth/disable">Disable account</a></p>
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index d51b0e2..186528b 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -126,13 +126,21 @@
         else:
             # if we did ask for extra, check filtered result
             has_more = len(filtered_timeline) == limit
+
+        if c.project.is_user_project:
+            header_text = 'Activity %s follows' % \
+                c.project.user_project_of.display_name
+        else:
+            header_text = 'Activity for %s' % c.project.name
+
         return dict(
             followee=followee,
             following=following,
             timeline=filtered_timeline,
             page=page,
             limit=limit,
-            has_more=has_more)
+            has_more=has_more,
+            header_text=header_text)
 
     @expose('jinja:forgeactivity:templates/index.html')
     @with_trailing_slash
diff --git a/ForgeActivity/forgeactivity/templates/index.html b/ForgeActivity/forgeactivity/templates/index.html
index c4a57a0..3f38a2f 100644
--- a/ForgeActivity/forgeactivity/templates/index.html
+++ b/ForgeActivity/forgeactivity/templates/index.html
@@ -23,12 +23,7 @@
 {% block title %}{{c.project.name}} Activity{% endblock %}
 
 {% block header %}
-    Activity for
-    {% if c.project.is_user_project %}
-        {{c.project.user_project_of.display_name}}
-    {% else %}
-        {{c.project.name}}
-    {% endif %}
+    {{header_text}}
 {% endblock %}
 
 {% block actions %}