diff --git a/madblog/templates/article.html b/madblog/templates/article.html
index 4aa9ebc..97d4a75 100644
--- a/madblog/templates/article.html
+++ b/madblog/templates/article.html
@@ -1,4 +1,4 @@
-{% with title=title or 'Platypush blog', skip_header=skip_header, styles=['/css/blog.css', '/css/code.css'] %}
+{% with title=title or config.title or 'Blog', skip_header=skip_header or not config.header, styles=['/css/blog.css', '/css/code.css'] %}
{% include 'common-head.html' %}
{% endwith %}
diff --git a/madblog/templates/common-head.html b/madblog/templates/common-head.html
index 4bdbb27..70ff268 100644
--- a/madblog/templates/common-head.html
+++ b/madblog/templates/common-head.html
@@ -16,7 +16,7 @@
{{ title }}
- {% if not skip_header and config.header %}
+ {% if not skip_header %}
{% if config.logo %}
diff --git a/madblog/templates/index.html b/madblog/templates/index.html
index 2e9ccb6..10a0f6a 100644
--- a/madblog/templates/index.html
+++ b/madblog/templates/index.html
@@ -1,4 +1,4 @@
-{% with title=title or 'Platypush blog', skip_header=False, styles=['/css/home.css'] %}
+{% with title=title or config.title or 'Blog', skip_header=not config.header, styles=['/css/home.css'] %}
{% include 'common-head.html' %}
{% endwith %}