diff --git a/.taskcluster.yml b/.taskcluster.yml
index a36157652..b8a3ba3b3 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -14,21 +14,22 @@ tasks:
           $let:
               # Github events have this stuff in different places...
               ownerEmail:
-                  $if: 'event.sender.login == "bors[bot]"'
-                  then: 'skaspari+mozlando@mozilla.com'   # It must match what's in bors.toml
-                  else: 
-                      $if: 'tasks_for == "github-push"'
-                      then: '${event.pusher.email}'
-                      # Assume Pull Request
+                  $if: 'tasks_for in ["cron", "action"]'
+                  then: '${tasks_for}@noreply.mozilla.org'
+                  else:
+                      $if: 'event.sender.login == "bors[bot]"'
+                      then: 'skaspari+mozlando@mozilla.com'   # It must match what's in bors.toml
                       else:
-                          $if: 'tasks_for == "github-pull-request"'
-                          then: '${event.pull_request.user.login}@users.noreply.github.com'
+                          $if: 'tasks_for == "github-push"'
+                          then: '${event.pusher.email}'
+                          # Assume Pull Request
                           else:
-                              $if: 'tasks_for == "github-release"'
-                              then: '${event.sender.login}@users.noreply.github.com'
+                              $if: 'tasks_for == "github-pull-request"'
+                              then: '${event.pull_request.user.login}@users.noreply.github.com'
                               else:
-                                  $if: 'tasks_for in ["cron", "action"]'
-                                  then: '${tasks_for}@noreply.mozilla.org'
+                                  $if: 'tasks_for == "github-release"'
+                                  then: '${event.sender.login}@users.noreply.github.com'
+
               baseRepoUrl:
                   $if: 'tasks_for in ["github-push", "github-release"]'
                   then: '${event.repository.html_url}'