diff --git a/tpl/template_embedded.go b/tpl/template_embedded.go
index eeab7ba5c..74fefb592 100644
--- a/tpl/template_embedded.go
+++ b/tpl/template_embedded.go
@@ -52,16 +52,17 @@ func (t *GoHtmlTemplate) EmbedTemplates() {
Recent content {{ with .Title }}in {{.}} {{ end }}on {{ .Site.Title }}
Hugo -- gohugo.io
{{ with .Site.LanguageCode }}{{.}}{{end}}
- {{ with .Site.Author.name }}{{.}}{{end}}
+ {{ if .Site.Author.email }}{{.Site.Author.email}}{{ with .Site.Author.name }} ({{.}}){{end}}{{end}}
+ {{ if .Site.Author.email }}{{.Site.Author.email}}{{ with .Site.Author.name }} ({{.}}){{end}}{{end}}
{{ with .Site.Copyright }}{{.}}{{end}}
- {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 MST" }}
+ {{ .Date.Format "Mon, 02 Jan 2006 15:04:05" }} {{ with .Date.Format "MST" }}{{ if eq . "UTC" }}UT{{else}}{{.}}{{end}}{{end}}
{{ range first 15 .Data.Pages }}
-
{{ .Title }}
{{ .Permalink }}
- {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 MST" }}
- {{with .Site.Author.name}}{{.}}{{end}}
+ {{ .Date.Format "Mon, 02 Jan 2006 15:04:05" }} {{ with .Date.Format "MST" }}{{ if eq . "UTC" }}UT{{else}}{{.}}{{end}}{{end}}
+ {{ if .Site.Author.email }}{{.Site.Author.email}}{{ with .Site.Author.name }} ({{.}}){{end}}{{end}}
{{ .Permalink }}
{{ .Content | html }}