diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 526a68e495..e49e165e8a 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -3,8 +3,19 @@
 <head data-suburl="{{AppSubUrl}}">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-	<meta name="author" content="{{if .Repository }}{{.Owner.Name}}{{else}}Gogs - Go Git Service{{end}}" />
-	<meta name="description" content="{{if .Repository }}{{.Repository.Name}} - {{.Repository.Description}}{{else}}Gogs (Go Git Service) is a painless self-hosted Git service written in Go{{end}}" />
+	<meta name="author" content="
+	{{- if .Repository -}}
+		{{.Owner.Name}}
+	{{- else -}}
+		Gogs - Go Git Service
+	{{- end}}" />
+	<meta name="description" content="
+	{{- if.Repository -}}
+		{{.Repository.Name}}
+		{{- if .Repository.Description}} - {{.Repository.Description}}{{end}}
+	{{- else -}}
+		Gogs (Go Git Service) is a painless self-hosted Git service written in Go
+	{{- end}}" />
 	<meta name="keywords" content="go, git, self-hosted, gogs">
 	<meta name="referrer" content="no-referrer" />
 	<meta name="_csrf" content="{{.CsrfToken}}" />
