diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs
index c9d8062e..52230237 100644
--- a/assets/scripts/app/templates/jobs/show.hbs
+++ b/assets/scripts/app/templates/jobs/show.hbs
@@ -29,12 +29,14 @@
 
       <div class="footer">
         <div class="author">
-          {{#if commit.authorName}}
-            <img src="https://travis-ci.org/images/mailer/mascot-avatar-40px.png"/>{{commit.authorName}} authored
-          {{/if}}
-          {{#if commit.committerName}}
-            <img src="https://travis-ci.org/images/mailer/mascot-avatar-40px.png"/>{{commit.committerName}} committed
+          {{#if job.commit.authorName}}
+            <div class="authored"><img {{bind-attr src="view.urlAuthorGravatarImage"}}/>{{job.commit.authorName}} authored{{#if job.commit.authorIsCommitter}} and committed{{/if}}</div>
           {{/if}}
+          {{#unless job.commit.authorIsCommitter}}
+            {{#if job.commit.committerName}}
+              <div class="committed"><img {{bind-attr src="view.urlCommitterGravatarImage"}}/>{{job.commit.committerName}} committed</div>
+            {{/if}}
+          {{/unless}}
         </div>
 
         <div class="commit-changes">
diff --git a/assets/scripts/app/views/job.coffee b/assets/scripts/app/views/job.coffee
index b32d5e06..44cb5862 100644
--- a/assets/scripts/app/views/job.coffee
+++ b/assets/scripts/app/views/job.coffee
@@ -30,3 +30,11 @@ Travis.reopen
     urlGithubCommit: (->
       Travis.Urls.githubCommit(@get('repo.slug'), @get('commit.sha'))
     ).property('repo.slug', 'commit.sha')
+
+    urlCommitterGravatarImage: (->
+      Travis.Urls.gravatarImage(@get('commit.committerEmail'), 40)
+    ).property('commit.committerEmail')
+
+    urlAuthorGravatarImage: (->
+      Travis.Urls.gravatarImage(@get('commit.authorEmail'), 40)
+    ).property('commit.authorEmail')