diff --git a/runbot_merge/controllers/__init__.py b/runbot_merge/controllers/__init__.py
index 23b65317..f5efcfb3 100644
--- a/runbot_merge/controllers/__init__.py
+++ b/runbot_merge/controllers/__init__.py
@@ -215,7 +215,7 @@ def handle_comment(env, event):
 
     repo = event['repository']['full_name']
     issue = event['issue']['number']
-    author = event['sender']['login']
+    author = event['comment']['user']['login']
     comment = event['comment']['body']
     _logger.info('comment: %s %s:%s "%s"', author, repo, issue, comment)
 
diff --git a/runbot_merge/tests/fake_github/__init__.py b/runbot_merge/tests/fake_github/__init__.py
index 5d39b66f..5b1f1600 100644
--- a/runbot_merge/tests/fake_github/__init__.py
+++ b/runbot_merge/tests/fake_github/__init__.py
@@ -747,8 +747,7 @@ class Client(werkzeug.test.Client):
             'action': 'created',
             'issue': { 'number': issue.number },
             'repository': self._repo(issue.repo.name),
-            'sender': { 'login': user },
-            'comment': { 'body': body },
+            'comment': { 'body': body, 'user': {'login': user } },
         }
         if isinstance(issue, PR):
             contents['issue']['pull_request'] = { 'url': 'fake' }