diff --git a/api/team.go b/api/team.go
index a331e9e348..8587a6de4a 100644
--- a/api/team.go
+++ b/api/team.go
@@ -283,10 +283,10 @@ func emailTeams(c *Context, w http.ResponseWriter, r *http.Request) {
 	} else {
 		teams := result.Data.([]*model.Team)
 
-		// the template expects Props to be a map with team names as the keys
+		// the template expects Props to be a map with team names as the keys and the team url as the value
 		props := make(map[string]string)
 		for _, team := range teams {
-			props[team.Name] = team.Name
+			props[team.Name] = c.GetTeamURLFromTeam(team)
 		}
 		bodyPage.Props = props
 
diff --git a/api/templates/find_teams_body.html b/api/templates/find_teams_body.html
index bd151a8197..64bff81265 100644
--- a/api/templates/find_teams_body.html
+++ b/api/templates/find_teams_body.html
@@ -21,7 +21,7 @@
                                                 <p>{{ if .Props }}
                                                         The following teams were found:<br>
                                                         {{range $index, $element := .Props}}
-                                                            {{ $index }}<br>
+                                                            <a href="{{ $element }}" style="text-decoration: none; color:#2389D7;">{{ $index }}</a><br>
                                                         {{ end }}
                                                     {{ else }}
                                                         We could not find any teams for the given email.