diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 578ff912f..6ab2f72c7 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -77,6 +77,7 @@ use constant DB_COLUMNS => qw(
     flags.requestee_id
     flags.setter_id
     flags.status
+    flags.creation_date
 );
 
 use constant DB_TABLE => 'flags';
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index fb247d524..4b0676359 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -776,6 +776,12 @@ sub create {
                     $_[0];
                 },
 
+            timestamp =>
+                sub {
+                    $_[0] =~ s/\D+//gso;
+                    $_[0];
+                },
+
             # We force filtering of every variable in key security-critical
             # places; we have a none filter for people to use when they 
             # really, really don't want a variable to be changed.
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index b7b443ba4..9d0157a9b 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -181,6 +181,7 @@
       [% END %]
 
         <span class="bz_comment_number">
+          <a name="[% comment.time FILTER timestamp %]"></a>
           <a name="c[% count %]" 
              href="show_bug.cgi?id=[% bug.bug_id %]#c[% count %]">
             [%- comment_label FILTER html %]</a>
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 0e6c99a82..991c3a425 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -146,7 +146,7 @@
     [% FOREACH flag = type.flags %]
       <tr>
         <td>
-          [% flag.setter.nick FILTER html %]:
+          <a href="#[% flag.creation_date FILTER timestamp %]">[% flag.setter.nick FILTER html %]</a>:
           <label title="[% type.description FILTER html %]"
                  for="flag-[% flag.id %]">
             [%- type.name FILTER html FILTER no_break -%]</label>