% if user.is_authenticated():
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 1ace8daaee..2b7b6d6e11 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -1,8 +1,10 @@
<%! from django.utils.translation import ugettext as _ %>
-<%inherit file="/main.html" />
<%! from django.core.urlresolvers import reverse %>
+
+<%inherit file="../main.html" />
<%namespace name='static' file='/static_content.html'/>
+<%block name="pagetitle">${_("Instructor Dashboard")}%block>
<%block name="headextra">
<%static:css group='style-course-vendor'/>
<%static:css group='style-course'/>
diff --git a/lms/templates/courseware/mktg_coming_soon.html b/lms/templates/courseware/mktg_coming_soon.html
index 0c90362019..78cf52d88d 100644
--- a/lms/templates/courseware/mktg_coming_soon.html
+++ b/lms/templates/courseware/mktg_coming_soon.html
@@ -8,7 +8,7 @@
<%inherit file="../mktg_iframe.html" />
-<%block name="title">
${_("About {course_id}").format(course_id=course_id)}%block>
+<%block name="pagetitle">${_("About {course_id}").format(course_id=course_id)}%block>
<%block name="bodyclass">view-iframe-content view-partial-mktgregister%block>
diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html
index 220dd45550..64c6661a30 100644
--- a/lms/templates/courseware/mktg_course_about.html
+++ b/lms/templates/courseware/mktg_course_about.html
@@ -8,7 +8,7 @@
<%inherit file="../mktg_iframe.html" />
-<%block name="title">${_("About {course_number}").format(course_number=course.display_number_with_default) | h}%block>
+<%block name="pagetitle">${_("About {course_number}").format(course_number=course.display_number_with_default) | h}%block>
<%block name="bodyclass">view-iframe-content view-partial-mktgregister%block>
diff --git a/lms/templates/courseware/news.html b/lms/templates/courseware/news.html
index c56319b4f7..fa848c0036 100644
--- a/lms/templates/courseware/news.html
+++ b/lms/templates/courseware/news.html
@@ -2,7 +2,7 @@
<%inherit file="main.html" />
<%namespace name='static' file='../static_content.html'/>
<%block name="bodyclass">courseware news%block>
-<%block name="title">${_("News - MITx 6.002x")}%block>
+<%block name="pagetitle">${_("News - MITx 6.002x")}%block>
<%block name="headextra">
<%static:css group='style-course-vendor'/>
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index 6cb80e43e2..534f7222fa 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -9,7 +9,7 @@
<%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
-<%block name="title">${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h}%block>
+<%block name="pagetitle">${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h}%block>
<%!
from django.core.urlresolvers import reverse
diff --git a/lms/templates/courseware/static_tab.html b/lms/templates/courseware/static_tab.html
index 464aec0bca..2efc351cc4 100644
--- a/lms/templates/courseware/static_tab.html
+++ b/lms/templates/courseware/static_tab.html
@@ -7,7 +7,7 @@
<%static:css group='style-course'/>
%block>
-<%block name="title">${course.display_number_with_default | h} ${tab['name']}%block>
+<%block name="pagetitle">${tab['name']} | ${course.display_number_with_default | h}%block>
<%include file="/courseware/course_navigation.html" args="active_page='static_tab_{0}'.format(tab['url_slug'])" />
diff --git a/lms/templates/courseware/syllabus.html b/lms/templates/courseware/syllabus.html
index d26fd259f7..302e14a0bb 100644
--- a/lms/templates/courseware/syllabus.html
+++ b/lms/templates/courseware/syllabus.html
@@ -7,7 +7,7 @@
<%static:css group='style-course'/>
%block>
-<%block name="title">${_("{course.display_number_with_default} Course Info").format(course=course) | h}%block>
+<%block name="pagetitle">${_("{course.display_number_with_default} Course Info").format(course=course) | h}%block>
<%include file="/courseware/course_navigation.html" args="active_page='syllabus'" />
<%!
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 523eecfe96..33470d1d0b 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -8,7 +8,7 @@
<%namespace name='static' file='static_content.html'/>
-<%block name="title">${_("Dashboard")}%block>
+<%block name="pagetitle">${_("Dashboard")}%block>
<%block name="bodyclass">view-dashboard is-authenticated%block>
<%block name="js_extra">
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index 04e367c8b9..4d4c350fe0 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -6,7 +6,7 @@
<%inherit file="../main.html" />
<%namespace name='static' file='../static_content.html'/>
<%block name="bodyclass">discussion%block>
-<%block name="title">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}%block>
+<%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}%block>
<%block name="headextra">
<%static:css group='style-course-vendor'/>
diff --git a/lms/templates/discussion/user_profile.html b/lms/templates/discussion/user_profile.html
index 53ff77a78b..7f5cee42d6 100644
--- a/lms/templates/discussion/user_profile.html
+++ b/lms/templates/discussion/user_profile.html
@@ -4,7 +4,7 @@
<%inherit file="../main.html" />
<%namespace name='static' file='../static_content.html'/>
<%block name="bodyclass">discussion%block>
-<%block name="title">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}%block>
+<%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}%block>
<%block name="headextra">
<%static:css group='style-course-vendor'/>
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
index b628a5af84..d9dcdde13b 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
@@ -1,6 +1,7 @@
<%! from django.utils.translation import ugettext as _ %>
-<%inherit file="/main.html" />
<%! from django.core.urlresolvers import reverse %>
+
+<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
## ----- Tips on adding something to the new instructor dashboard -----
@@ -16,6 +17,8 @@
## 5. Implement your standard django/python in lms/djangoapps/instructor/views/api.py
## 6. And tests go in lms/djangoapps/instructor/tests/
+<%block name="pagetitle">${_("Instructor Dashboard")}%block>
+
<%block name="headextra">
<%static:css group='style-course-vendor'/>
<%static:css group='style-course'/>
diff --git a/lms/templates/instructor/staff_grading.html b/lms/templates/instructor/staff_grading.html
index 09b41f91aa..dfec9af5f8 100644
--- a/lms/templates/instructor/staff_grading.html
+++ b/lms/templates/instructor/staff_grading.html
@@ -9,7 +9,7 @@
%block>
-<%block name="title">${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default) | h}%block>
+<%block name="pagetitle">${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default) | h}%block>
<%include file="/courseware/course_navigation.html" args="active_page='staff_grading'" />
diff --git a/lms/templates/login.html b/lms/templates/login.html
index e8ddcd1b20..651d1be183 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -5,7 +5,7 @@
<%! from django.core.urlresolvers import reverse %>
<%! from django.utils.translation import ugettext as _ %>
-<%block name="title">${_("Log into your {platform_name} Account").format(platform_name=platform_name)}%block>
+<%block name="pagetitle">${_("Log into your {platform_name} Account").format(platform_name=platform_name)}%block>
<%block name="js_extra">
diff --git a/lms/templates/verify_student/photo_verification.html b/lms/templates/verify_student/photo_verification.html
index 8e754452c0..f683ff905f 100644
--- a/lms/templates/verify_student/photo_verification.html
+++ b/lms/templates/verify_student/photo_verification.html
@@ -1,17 +1,16 @@
<%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %>
+
<%inherit file="../main.html" />
<%namespace name='static' file='/static_content.html'/>
<%block name="bodyclass">register verification-process step-photos ${'is-upgrading' if upgrade else ''}%block>
-<%block name="title">
-
+<%block name="pagetitle">
%if upgrade:
${_("Upgrade Your Registration for {} | Verification").format(course_name)}
%else:
${_("Register for {} | Verification").format(course_name)}
%endif
-
%block>
<%block name="js_extra">
diff --git a/lms/templates/verify_student/reverification_confirmation.html b/lms/templates/verify_student/reverification_confirmation.html
index 5b2ee17333..47751edc5a 100644
--- a/lms/templates/verify_student/reverification_confirmation.html
+++ b/lms/templates/verify_student/reverification_confirmation.html
@@ -1,11 +1,11 @@
-
<%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %>
+
<%inherit file="../main.html" />
<%namespace name='static' file='/static_content.html'/>
<%block name="bodyclass">register verification-process is-not-verified step-confirmation%block>
-<%block name="title">${_("Re-Verification Submission Confirmation")}%block>
+<%block name="pagetitle">${_("Re-Verification Submission Confirmation")}%block>
<%block name="js_extra">
diff --git a/lms/templates/verify_student/show_requirements.html b/lms/templates/verify_student/show_requirements.html
index ed9fa4747b..8660db36aa 100644
--- a/lms/templates/verify_student/show_requirements.html
+++ b/lms/templates/verify_student/show_requirements.html
@@ -1,15 +1,14 @@
<%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %>
+
<%inherit file="../main.html" />
<%block name="bodyclass">register verification-process step-requirements ${'is-upgrading' if upgrade else ''}%block>
-<%block name="title">
-
+<%block name="pagetitle">
%if upgrade:
${_("Upgrade Your Registration for {}").format(course_name)}
%else:
${_("Register for {}").format(course_name)}
%endif
-
%block>
<%block name="content">
diff --git a/lms/templates/verify_student/verified.html b/lms/templates/verify_student/verified.html
index 41b4b312b9..965fe498f1 100644
--- a/lms/templates/verify_student/verified.html
+++ b/lms/templates/verify_student/verified.html
@@ -1,10 +1,11 @@
<%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %>
+
<%inherit file="../main.html" />
<%namespace name='static' file='/static_content.html'/>
<%block name="bodyclass">register verification-process is-verified%block>
-<%block name="title">${_("Register for {} | Verification").format(course_name)}%block>
+<%block name="pagetitle">${_("Register for {} | Verification").format(course_name)}%block>
<%block name="js_extra">