diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 68ccf9d275..796566017e 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -128,19 +128,21 @@
 		</div>
 
 		<div class="ui bottom attached segment flex-text-block tw-flex-wrap">
-			<div class="flex-text-inline">
-				{{if .Author}}
+			{{if .Author}}
+				<div class="flex-text-inline">
 					{{ctx.AvatarUtils.Avatar .Author 20}}
 					{{if .Author.FullName}}
 						<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a>
 					{{else}}
 						<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a>
 					{{end}}
-				{{else}}
+				</div>
+			{{else}}
+				<div class="flex-text-inline" data-tooltip-content={{.Commit.Author.Email}}>
 					{{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 20}}
 					<strong>{{.Commit.Author.Name}}</strong>
-				{{end}}
-			</div>
+				</div>
+			{{end}}
 
 			<span class="text grey">{{DateUtils.TimeSince .Commit.Author.When}}</span>
 
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index 959f2a9398..c38eaf9036 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -22,8 +22,8 @@
 								{{end}}
 								{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}<a class="muted author-wrapper" href="{{.User.HomeLink}}">{{$userName}}</a>
 							{{else}}
-								{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 28 "tw-mr-2"}}
-								<span class="author-wrapper">{{$userName}}</span>
+								{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Email 28 "tw-mr-2"}}
+								<span class="author-wrapper" data-tooltip-content={{.Author.Email}}>{{$userName}}</span>
 							{{end}}
 						</div>
 					</td>
diff --git a/templates/repo/latest_commit.tmpl b/templates/repo/latest_commit.tmpl
index cff338949f..e328b48e84 100644
--- a/templates/repo/latest_commit.tmpl
+++ b/templates/repo/latest_commit.tmpl
@@ -12,7 +12,7 @@
 	{{else}}
 		{{if .LatestCommit.Author}}
 			{{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24}}
-			<span class="author-wrapper" title="{{.LatestCommit.Author.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></span>
+			<span class="author-wrapper" data-tooltip-content={{.LatestCommit.Author.Email}}><strong>{{.LatestCommit.Author.Name}}</strong></span>
 		{{end}}
 	{{end}}