diff --git a/lib/git_stats/stats_view/charts/authors_charts.rb b/lib/git_stats/stats_view/charts/authors_charts.rb
index 99bbef628..35dc22cb1 100644
--- a/lib/git_stats/stats_view/charts/authors_charts.rb
+++ b/lib/git_stats/stats_view/charts/authors_charts.rb
@@ -10,7 +10,7 @@ module GitStats
         def commits_sum_by_author_by_date(limit = 4)
           Chart.new do |f|
             f.multi_date_chart(
-                data: @authors.sort_by { |author| -author.commits.size }[0..limit].map { |author| {name: author.email, data: author.commits_sum_by_date} },
+                data: @authors.sort_by { |author| -author.commits.size }[0..limit].map { |author| {name: author.name, data: author.commits_sum_by_date} },
                 title: :lines_by_date.t,
                 y_text: :lines.t
             )
@@ -21,7 +21,7 @@ module GitStats
           define_method "#{method}_by_author_by_date" do |limit = 4|
             Chart.new do |f|
               f.multi_date_chart(
-                  data: @authors.sort_by { |author| -author.send(method) }[0..limit].map { |author| {name: author.email, data: author.send("#{method}_by_date")} },
+                  data: @authors.sort_by { |author| -author.send(method) }[0..limit].map { |author| {name: author.name, data: author.send("#{method}_by_date")} },
                   title: :lines_by_date.t,
                   y_text: :lines.t
               )
diff --git a/templates/activity/_activity.haml b/templates/activity/_activity.haml
index f9ac04b51..6b439ef51 100644
--- a/templates/activity/_activity.haml
+++ b/templates/activity/_activity.haml
@@ -19,7 +19,7 @@
     .tab-pane.active
       .page-header.pagination-centered
         %h1= page.t
-        %h3= author.respond_to?(:name) ? author.name : ""
+        %h3= "#{author.respond_to?(:name) ? author.name : ""} #{author.respond_to?(:email) ? "<#{author.email}>" : ""}"
     - if page == :activity_by_date
       = high_stock("charts.activity_by_date", charts.activity_by_date(author))
 
diff --git a/templates/authors/_authors.haml b/templates/authors/_authors.haml
index cf26c0dca..a899d5d71 100644
--- a/templates/authors/_authors.haml
+++ b/templates/authors/_authors.haml
@@ -31,7 +31,7 @@
           - sorted_authors.each_with_index do |author, i|
             %tr
               %th= i+1
-              %th= author.name
+              %th= "#{author.name} <#{author.email}>"
               %td= author.commits.size
               %td= author.insertions
               %td= author.deletions