diff --git a/runbot/runbot.py b/runbot/runbot.py
index cfe525db..f7f64a76 100644
--- a/runbot/runbot.py
+++ b/runbot/runbot.py
@@ -852,7 +852,9 @@ class runbot_build(osv.osv):
                     'branch_id': build.branch_id.id,
                     'name': build.name,
                     'author': build.author,
+                    'author_email': build.author_email,
                     'committer': build.committer,
+                    'committer_email': build.committer_email,
                     'subject': build.subject,
                     'modules': build.modules,
                 }
diff --git a/runbot/runbot.xml b/runbot/runbot.xml
index b69f0d16..fcae458d 100644
--- a/runbot/runbot.xml
+++ b/runbot/runbot.xml
@@ -404,7 +404,7 @@
                                         </t>
                                         <br/>
                                     </t>
-                                    <small><t t-esc="bu['dest']"/></small><br/>
+                                    <small><t t-esc="bu['dest']"/> on <t t-esc="bu['host']"/></small><br/>
                                     <t t-call="runbot.build_name"/>
                                 </td>
                             </t>
diff --git a/runbot_cla/runbot.py b/runbot_cla/runbot.py
index c3b630b7..909170ea 100644
--- a/runbot_cla/runbot.py
+++ b/runbot_cla/runbot.py
@@ -13,25 +13,27 @@ class runbot_build(openerp.models.Model):
     _inherit = "runbot.build"
 
     def job_15_check_cla(self, cr, uid, build, lock_path, log_path):
-        cla_glob = build.path("doc/cla/*/*.md")
+        cla_glob = glob.glob(build.path("doc/cla/*/*.md"))
         if cla_glob:
-            cla = ''.join(open(f).read() for f in glob.glob(cla_glob))
+            cla = ''.join(open(f).read() for f in cla_glob)
             cla = cla.lower()
+            cla = cla.decode('utf-8')
             mo = re.search('[^ <@]+@[^ @>]+', build.author_email or '')
             state = "failure"
             if mo:
                 email = mo.group(0).lower()
                 if re.match('.*(odoo|openerp|tinyerp).com$',email):
                     state = "success"
-                if cla.find(mo.group(0).lower()) != -1:
+                if cla.find(email) != -1:
                     state = "success"
+                _logger.info('CLA build:%s email:%s result:%s', build.dest, email, state)
             status = {
                 "state": state,
                 "target_url": "http://www.odoo.com/sign-cla",
                 "description": "%s Odoo CLA signature check" % build.author,
                 "context": "legal/cla"
             }
-            build._log('check_cla', 'Check CLA %s' % state)
+            build._log('check_cla', 'CLA %s' % state)
             build.repo_id.github('/repos/:owner/:repo/statuses/%s' % build.name, status, ignore_errors=True)
         # 0 is myself, -1 is everybody else, -2 nothing
         return -2