diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index 3087f477..42accac0 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -47,6 +47,8 @@ sub jobset_GET {
 
     $c->stash->{totalShares} = getTotalShares($c->model('DB')->schema);
 
+    $c->stash->{emailNotification} = $c->config->{email_notification} // 0;
+
     $self->status_ok($c, entity => $c->stash->{jobset});
 }
 
@@ -173,6 +175,7 @@ sub edit : Chained('jobsetChain') PathPart Args(0) {
     $c->stash->{edit} = !defined $c->stash->{params}->{cloneJobset};
     $c->stash->{cloneJobset} = defined $c->stash->{params}->{cloneJobset};
     $c->stash->{totalShares} = getTotalShares($c->model('DB')->schema);
+    $c->stash->{emailNotification} = $c->config->{email_notification} // 0;
 }
 
 
diff --git a/src/lib/Hydra/Plugin/EmailNotification.pm b/src/lib/Hydra/Plugin/EmailNotification.pm
index c7bc5d95..c2887631 100644
--- a/src/lib/Hydra/Plugin/EmailNotification.pm
+++ b/src/lib/Hydra/Plugin/EmailNotification.pm
@@ -44,6 +44,8 @@ EOF
 sub buildFinished {
     my ($self, $build, $dependents) = @_;
 
+    return unless $self->{config}->{email_notification} // 0;
+
     die unless $build->finished;
 
     # Figure out to whom to send notification for each build.  For
diff --git a/src/root/edit-jobset.tt b/src/root/edit-jobset.tt
index 30b9a4c9..6c380a3a 100644
--- a/src/root/edit-jobset.tt
+++ b/src/root/edit-jobset.tt
@@ -130,7 +130,7 @@
     <div class="control-group">
       <div class="controls">
         <label class="checkbox">
-          <input type="checkbox" name="enableemail" [% IF jobset.enableemail; 'checked="checked"'; END %]/>Email notification
+          <input type="checkbox" name="enableemail" [% IF jobset.enableemail; 'checked="checked"'; END %] [%IF !emailNotification%]disabled=1[%END%] />Email notification
         </label>
       </div>
     </div>
@@ -138,7 +138,7 @@
     <div class="control-group">
       <label class="control-label">Email override</label>
       <div class="controls">
-        <input type="text" class="span3" name="emailoverride" [% HTML.attributes(value => jobset.emailoverride) %]/>
+        <input type="text" class="span3" name="emailoverride" [% HTML.attributes(value => jobset.emailoverride) %] [%IF !emailNotification%]disabled=1[%END%] />
       </div>
     </div>
 
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 2cf92a35..33139c74 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -148,6 +148,7 @@
         <th>Scheduling shares:</th>
         <td>[% jobset.schedulingshares %] [% IF totalShares %] ([% f = format("%.2f"); f(jobset.schedulingshares / totalShares * 100) %]% out of [% totalShares %] shares)[% END %]</td>
       </tr>
+      [% IF emailNotification %]
       <tr>
         <th>Enable email notification:</th>
         <td>[% jobset.enableemail ? "Yes" : "No" %]</td>
@@ -156,6 +157,7 @@
         <th>Email override:</th>
         <td>[% HTML.escape(jobset.emailoverride) %]</td>
       </tr>
+      [% END %]
       <tr>
         <th>Number of evaluations to keep:</th>
         <td>[% jobset.keepnr %]</td>