diff --git a/runbot/controllers/frontend.py b/runbot/controllers/frontend.py
index 889d5e91..915bc54b 100644
--- a/runbot/controllers/frontend.py
+++ b/runbot/controllers/frontend.py
@@ -198,7 +198,8 @@ class Runbot(http.Controller):
             'build': self.build_info(build),
             'br': {'branch': build.branch_id},
             'logs': Logging.sudo().browse(logging_ids).ids,
-            'other_builds': other_builds.ids
+            'other_builds': other_builds.ids,
+            'bu_index': 0 if build == build_ids[0] else -1
         }
         return request.render("runbot.build", context)
 
diff --git a/runbot/templates/build.xml b/runbot/templates/build.xml
index c7765f60..90894fa6 100644
--- a/runbot/templates/build.xml
+++ b/runbot/templates/build.xml
@@ -105,7 +105,6 @@
                                 <div class="btn-group">
                                     <t t-call="runbot.build_button">
                                         <t t-set="bu" t-value="build"/>
-                                        <t t-set="bu_index" t-value="-1"/>
                                         <t t-set="klass" t-value="''"/>
                                     </t>
                                 </div>
@@ -167,6 +166,7 @@
                             Subject: <t t-esc="build['subject']"/><br/>
                             Author: <t t-esc="build['author']"/><br/>
                             Committer: <t t-esc="build['committer']"/><br/>
+                            Build host: <t t-esc="build['host']"/><br/>
                         </p>
                         <p t-if="build['duplicate_of']">Duplicate of <a t-attf-href="/runbot/build/#{build['duplicate_of'].id}"><t t-esc="build['duplicate_of'].dest"/></a></p>
                         <table class="table table-condensed table-striped">