diff --git a/src/lib/Hydra/Controller/User.pm b/src/lib/Hydra/Controller/User.pm
index 4b6033a8..7ddfb6e8 100644
--- a/src/lib/Hydra/Controller/User.pm
+++ b/src/lib/Hydra/Controller/User.pm
@@ -302,8 +302,12 @@ sub my_jobs_tab :Chained('user') :PathPart('my-jobs-tab') :Args(0) {
     $c->stash->{builds} = [$c->model('DB::Builds')->search(
         { iscurrent => 1
         , maintainers => { ilike => "%" . $c->stash->{user}->emailaddress . "%" }
+        , "project.enabled" => 1
+        , "jobset.enabled" => 1
         },
-        { order_by => ["project", "jobset", "job"] })];
+        { order_by => ["project", "jobset", "job"]
+        , join => ["project", "jobset"]
+        })];
 }
 
 
diff --git a/src/root/dashboard-my-jobs-tab.tt b/src/root/dashboard-my-jobs-tab.tt
index 9e15cd7d..6dee16b5 100644
--- a/src/root/dashboard-my-jobs-tab.tt
+++ b/src/root/dashboard-my-jobs-tab.tt
@@ -9,7 +9,7 @@
 
 [% ELSE %]
 
-  <p>Below is the most recent build of every job of which you
+  <p>Below are the most recent builds of the [% builds.size %] jobs of which you
   (<tt>[% HTML.escape(user.emailaddress) %]</tt>) are a maintainer.</p>
   
   [% INCLUDE renderBuildList %]