diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 6a1975a..fec0354 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -1,6 +1,9 @@
+    {{- $author := .Site.Params.Author -}}
+    {{- $description := or (.Description) (.Site.Params.Description) -}}
+    {{- $keywords := or (.Keywords) (.Site.Params.Keywords) -}}
     <meta charset="utf-8">
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-    <meta name="description" content="{{ .Site.Params.Description }}">
-    <meta name="keywords" content="{{ range .Site.Params.Keywords }}{{ . }},{{ end }}">
-    <meta name="author" content="{{ .Site.Params.Author }}">
\ No newline at end of file
+    {{ if $author -}} <meta name="author" content="{{ range $author }} {{ .displayname }}, {{ end}}"> {{- end }}
+    {{ if $description -}} <meta name="description" content="{{ $description }}"> {{- end }}
+    {{ if $keywords -}} <meta name="keywords" content="{{ range $keywords }}{{ . }},{{ end }}"> {{- end }}