diff --git a/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
index a11c1c380f6..5055565e3c5 100644
--- a/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -24,10 +24,6 @@
 <blockquote>
   <table border="1" cellpadding="3">  
     <tr>
-      <th>
-        Show in <br>
-        Footer
-      </th>
       <th>
         Search
       </th>
@@ -40,15 +36,32 @@
       <th>
         Forget
       </th>
+      <th>
+        Show in
+        Footer
+      </th>
+    </tr>
+    <tr>
+      <td>My Bugs</td>
+      <td>
+        [% filtered_username = user.login FILTER url_quote %]
+        <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">Run</a>
+      </td>
+      <td>
+        &nbsp;
+      </td>
+      <td>
+        &nbsp;
+      </td>
+      <td align="center">
+        <input type="checkbox" 
+               name="showmybugslink"
+               value="1"
+               [% " checked" IF user.showmybugslink %]>
+      </td>
     </tr>
     [% FOREACH q = queries %]
       <tr>
-        <td>
-          <input type="checkbox" 
-                 name="linkinfooter_[% q.name FILTER html %]"
-                 value="1"
-                 [% " checked" IF q.linkinfooter %]>
-        </td>
         <td>[% q.name FILTER html %]</td>
         <td>
           <a href="buglist.cgi?[% q.query FILTER html %]">Run</a>
@@ -60,6 +73,12 @@
           <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
                    [% q.name FILTER html %]">Forget</a>
         </td>
+        <td align="center">
+          <input type="checkbox" 
+                 name="linkinfooter_[% q.name FILTER html %]"
+                 value="1"
+                 [% " checked" IF q.linkinfooter %]>
+        </td>
       </tr>
     [% END %]
   </table>
diff --git a/mozilla/webtools/bugzilla/userprefs.cgi b/mozilla/webtools/bugzilla/userprefs.cgi
index cd73678c9b3..f71fdec02cd 100755
--- a/mozilla/webtools/bugzilla/userprefs.cgi
+++ b/mozilla/webtools/bugzilla/userprefs.cgi
@@ -298,6 +298,7 @@ sub DoPermissions {
 
 
 sub DoSavedSearches() {
+    $vars->{'user'} = Bugzilla->user;
     $vars->{'queries'} = Bugzilla->user->queries;
 }
 
@@ -315,6 +316,11 @@ sub SaveSavedSearches() {
     }
 
     Bugzilla->user->flush_queries_cache;
+    
+    my $showmybugslink = defined($cgi->param("showmybugslink")) ? 1 : 0;
+    $dbh->do("UPDATE profiles SET mybugslink = $showmybugslink " . 
+             "WHERE userid = " . Bugzilla->user->id);    
+    Bugzilla->user->{'showmybugslink'} = $showmybugslink;
 }