diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index 8e8f8c8f6e..71ef9efb6f 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -278,6 +278,11 @@ def html_message_formatter(mode, name, build, results, master_status):
             name = "%s.%s" % (log.getStep().getName(), log.getName())
             status, dummy = log.getStep().getResults()
             content = log.getText().splitlines() # Note: can be VERY LARGE
+
+            if step.getName() == 'runtask':
+                taskname = re.search("task=\['(.*)\.yml'\]", content).group(1)
+                text.insert(0, '<h4>Task name: %s</h4>' % taskname)
+
             url = u'%s/steps/%s/logs/%s' % (master_status.getURLForThing(build),
                                            log.getStep().getName(), log.getName())
 
@@ -297,8 +302,6 @@ def html_message_formatter(mode, name, build, results, master_status):
 
         text.append(u'<br><br>')
         text.append(u'<b>-The Buildbot</b>')
-        taskname = re.search("task=\['(.*)\.yml'\]", t).group(1)
-        test.insert(0, '<h4>Task name: %s</h4>' % taskname)
 
         return {
             'body': u"\n".join(text),