diff --git a/_config.yml b/_config.yml
index 6275152702..f06f05711b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,7 @@
 url: https://home-assistant.io
 title: Home Assistant
 subtitle: Open-source home automation platform running on Python 3
-author: Paulus Schoutsen
+author: Home Assistant
 simple_search: https://www.google.com/search
 description: Home Assistant is an open-source home automation platform running on Python 3.
 
diff --git a/source/_cookbook/tor_configuration.markdown b/source/_cookbook/tor_configuration.markdown
index 5b8072e5f4..83a7609135 100644
--- a/source/_cookbook/tor_configuration.markdown
+++ b/source/_cookbook/tor_configuration.markdown
@@ -8,6 +8,8 @@ comments: false
 sharing: true
 footer: true
 ha_category: Infrastructure
+author: Nathan Freitas
+author_twitter: n8fr8
 ---
 
 This is an example about how you can configure Tor to provide secure remote access to your Home Assistant instance as an Onion site, through Tor's Hidden Service feature. With this enabled, you do not need to open your firewall ports or setup HTTPS to enable secure remote access.
diff --git a/source/_includes/site/head.html b/source/_includes/site/head.html
index 5d0d660be8..0c2a76007f 100644
--- a/source/_includes/site/head.html
+++ b/source/_includes/site/head.html
@@ -11,7 +11,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
-    <meta name="author" content="{{ site.author }}">
+    <meta name="author" content="{% if page.author %}{{ page.author }}{% else %}{{ site.author }}{% endif %}">
     <meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}">
     {% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %}
     <meta name="viewport" content="width=device-width">