diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig
index 3e318e276..a86c15954 100644
--- a/source/_layouts/base.html.twig
+++ b/source/_layouts/base.html.twig
@@ -25,15 +25,15 @@
{% endif %}
+ {% set page_title = page.title %}
{% if page.meta.title %}
- {{ page.meta.title }}
-
-
- {% else %}
- {{ page.title }} | {{ site.name }}
-
-
+ {% set page_title = page.meta.title %}
+ {% elseif block('page_title') %}
+ {% set page_title = block('page_title') %}
{% endif %}
+ {{ page_title }} | {{ site.name }}
+
+
{% block body %}{% endblock %}
diff --git a/source/_pages/index.md b/source/_pages/index.md
index c41a606fd..6dc170c80 100644
--- a/source/_pages/index.md
+++ b/source/_pages/index.md
@@ -2,7 +2,7 @@
title: Do you need a certified Drupal expert, core contributor and module maintainer?
permalink: /
meta:
- title: '%site.slogan% | %site.name%'
+ title: '%site.slogan%'
---
{% block meta_title %}Certified Drupal expert, Developer and Consultant | {{ site.name }}{% endblock %}