diff --git a/_includes/head.html b/_includes/head.html
index 1206644..57e5878 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,7 +3,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
+  <title>{% if page.title %}{{ page.title | escape }} | {% endif %}{{ site.title | escape }}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
   <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
diff --git a/faq.md b/faq.md
index baff9dc..ea1c1bc 100644
--- a/faq.md
+++ b/faq.md
@@ -1,6 +1,7 @@
 ---
 layout: default
 permalink: /faq/
+title: faq
 ---
 FAQ
 ===