diff --git a/frappe/website/context.py b/frappe/website/context.py
index 2738122411..cee4c9a2c7 100644
--- a/frappe/website/context.py
+++ b/frappe/website/context.py
@@ -123,6 +123,9 @@ def build_context(context):
 		app_base = frappe.get_hooks("base_template")
 		context.base_template_path = app_base[0] if app_base else "templates/base.html"
 
+	if context.title_prefix and context.title and not context.title.startswith(context.title_prefix):
+		context.title = '{0} - {1}'.format(context.title_prefix, context.title)
+
 	return context
 
 def add_sidebar_data(context):
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 78e775000c..e72dc4b91b 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -83,7 +83,7 @@ def get_website_settings():
 	settings = frappe.get_doc("Website Settings", "Website Settings")
 	for k in ["banner_html", "brand_html", "copyright", "twitter_share_via",
 		"facebook_share", "google_plus_one", "twitter_share", "linked_in_share",
-		"disable_signup", "hide_footer_signup", "head_html"]:
+		"disable_signup", "hide_footer_signup", "head_html", "title_prefix"]:
 		if hasattr(settings, k):
 			context[k] = settings.get(k)