diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ConfirmEmail.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ConfirmEmail.cshtml
index f41619f893..16ddeb6a4d 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ConfirmEmail.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ConfirmEmail.cshtml
@@ -2,7 +2,7 @@
     ViewData["Title"] = "Confirm Email";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div>
     <p>
         Thank you for confirming your email. Please <a asp-controller="Account" asp-action="Login">click here to log in</a>.
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml
index 6794e26d03..e0b53864d9 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>Associate your @ViewData["LoginProvider"] account.</h3>
 
 <form asp-controller="Account" asp-action="ExternalLoginConfirmation" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml
index d89339e012..20f7ce6565 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml
@@ -3,6 +3,6 @@
 }
 
 <header>
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-danger">Unsuccessful login with service.</p>
 </header>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml
index ab9bf44c8d..4642b6b680 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml
@@ -2,7 +2,7 @@
     ViewData["Title"] = "Forgot Password Confirmation";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p>
     Please check your email to reset your password.
 </p>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.cshtml
index ba14956bf7..e0f1d7005f 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div class="row">
     <div class="col-md-8">
         <section>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Register.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Register.cshtml
index dad5ea2fb6..720265eb35 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Register.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Register.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
     <h4>Create a new account.</h4>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPassword.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPassword.cshtml
index 6e584da56d..0013f02d96 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPassword.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPassword.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="ResetPassword" method="post" class="form-horizontal">
     <h4>Reset your password.</h4>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/SendCode.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/SendCode.cshtml
index 729ea9ed99..1733b96f43 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/SendCode.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/SendCode.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Send Verification Code";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="SendCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal">
     <input asp-for="RememberMe" type="hidden" />
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/VerifyCode.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/VerifyCode.cshtml
index 52a4c736bb..bc29c76a39 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/VerifyCode.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/VerifyCode.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="VerifyCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal">
     <div asp-validation-summary="All" class="text-danger"></div>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddLogoutUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddLogoutUri.cshtml
index c48920e19e..a9c8cbb7e1 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddLogoutUri.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddLogoutUri.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a logout uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <ul class="list-unstyled">
             <li class="h4">Name</li>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddRedirectUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddRedirectUri.cshtml
index d4c58b9c17..0ababd8237 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddRedirectUri.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddRedirectUri.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a redirect uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <ul class="list-unstyled">
             <li class="h4">Name</li>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddScope.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddScope.cshtml
index 12560413e9..b6177155a4 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddScope.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddScope.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a scope to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
     <ul class="list-unstyled">
         <li class="h4">Name</li>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Create.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Create.cshtml
index 8d9b734f50..a208423fc2 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Create.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Create.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Create your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <form asp-action="Create" method="post">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml
index 9eadd763ba..7cc217f7dc 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a logout uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml
index 4a0dc6d749..09a39420ac 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a redirect uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateScope.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateScope.cshtml
index 134fed3a76..2575852d64 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateScope.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateScope.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a scope to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditScope.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditScope.cshtml
index b9d95d8139..16ac023eb7 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditScope.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditScope.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Edit scope";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
     <ul class="list-unstyled">
         <li class="h4">Name</li>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml
index dd6cd3838e..80e2a0bf10 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Generate an application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml
index fabb4e2220..27561f354e 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Application key successfully generated";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Index.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Index.cshtml
index 459772e56b..e4b7f849c6 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Index.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Index.cshtml
@@ -3,7 +3,7 @@
         ViewData["Title"] = "Manage your applications";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-success">@ViewData["StatusMessage"]</p>
 
     <div>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml
index 687746e496..7188005e24 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Regenerate an application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml
index fe361c8660..d058457f97 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Remove the application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml
index 4025edb66a..945a96ce68 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml
@@ -3,5 +3,5 @@
 @{
     ViewData["Title"] = "Invalid logout redirect";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-warning">@Model.ErrorDescription</p>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/SignedOut.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/SignedOut.cshtml
index 43b6ce579a..c6bec5eb1a 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/SignedOut.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/SignedOut.cshtml
@@ -1,5 +1,5 @@
 @{
     ViewData["Title"] = "Signed Out";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">You have successfully signed out.</p>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml
index 5e96c6e218..37c1eddac8 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Add Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <form asp-controller="Manage" asp-action="AddPhoneNumber" method="post" class="form-horizontal">
     <h4>Add a phone number.</h4>
     <hr />
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ChangePassword.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ChangePassword.cshtml
index 95f4a3bcd7..ec31619fcf 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ChangePassword.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ChangePassword.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Change Password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="ChangePassword" method="post" class="form-horizontal">
     <h4>Change Password</h4>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/Index.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/Index.cshtml
index 6582645969..98cded32cf 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/Index.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/Index.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Manage your account";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">@ViewData["StatusMessage"]</p>
 
 <div>
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ManageLogins.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ManageLogins.cshtml
index b3de9cef05..afecc3d095 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ManageLogins.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ManageLogins.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Manage your external logins";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <p class="text-success">@ViewData["StatusMessage"]</p>
 @if (Model.CurrentLogins.Count > 0)
diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml
index e8b460ee4e..be49c93a8b 100644
--- a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="VerifyPhoneNumber" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
     <input asp-for="PhoneNumber" type="hidden" />
diff --git a/samples/IdentityOIDCWebApplicationSample/Views/Account/SignedOut.cshtml b/samples/IdentityOIDCWebApplicationSample/Views/Account/SignedOut.cshtml
index 9e6b0f314b..47370348d2 100644
--- a/samples/IdentityOIDCWebApplicationSample/Views/Account/SignedOut.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Views/Account/SignedOut.cshtml
@@ -1,5 +1,5 @@
 @{
     ViewData["Title"] = "Signed Out";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">You have successfully signed out.</p>
diff --git a/samples/IdentityOIDCWebApplicationSample/Views/Home/About.cshtml b/samples/IdentityOIDCWebApplicationSample/Views/Home/About.cshtml
index 50476d1fbd..680d4b51be 100644
--- a/samples/IdentityOIDCWebApplicationSample/Views/Home/About.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Views/Home/About.cshtml
@@ -1,7 +1,7 @@
 @{
     ViewData["Title"] = "About";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>@ViewData["Message"]</h3>
 
 <p>Use this area to provide additional information.</p>
diff --git a/samples/IdentityOIDCWebApplicationSample/Views/Home/Contact.cshtml b/samples/IdentityOIDCWebApplicationSample/Views/Home/Contact.cshtml
index 15c12c6d12..b06a159fcf 100644
--- a/samples/IdentityOIDCWebApplicationSample/Views/Home/Contact.cshtml
+++ b/samples/IdentityOIDCWebApplicationSample/Views/Home/Contact.cshtml
@@ -1,7 +1,7 @@
 @{
     ViewData["Title"] = "Contact";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>@ViewData["Message"]</h3>
 
 <address>
diff --git a/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml b/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml
index 3244fef5f1..3043a23ac0 100644
--- a/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml
@@ -2,7 +2,7 @@
     ViewData["Title"] = "Confirm Email";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div>
     <p>
         Thank you for confirming your email. Please <a asp-controller="Account" asp-action="Login">Click here to Log in</a>.
diff --git a/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml b/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml
index 06aff0d966..0bd3f75c1a 100644
--- a/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>Associate your @ViewData["ProviderDisplayName"] account.</h3>
 
 <form asp-controller="Account" asp-action="ExternalLoginConfirmation" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
diff --git a/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml b/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml
index d89339e012..20f7ce6565 100644
--- a/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml
@@ -3,6 +3,6 @@
 }
 
 <header>
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-danger">Unsuccessful login with service.</p>
 </header>
diff --git a/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml b/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml
index 8400cc7e28..5603e2a08c 100644
--- a/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Forgot your password?";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p>
     For more information on how to enable reset password please see this <a href="http://go.microsoft.com/fwlink/?LinkID=532713">article</a>.
 </p>
diff --git a/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml b/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml
index ab9bf44c8d..4642b6b680 100644
--- a/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml
@@ -2,7 +2,7 @@
     ViewData["Title"] = "Forgot Password Confirmation";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p>
     Please check your email to reset your password.
 </p>
diff --git a/samples/IdentitySample.Mvc/Views/Account/Login.cshtml b/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
index 00e0e9ca33..b8803908e1 100644
--- a/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
@@ -8,7 +8,7 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div class="row">
     <div class="col-md-8">
         <section>
diff --git a/samples/IdentitySample.Mvc/Views/Account/Register.cshtml b/samples/IdentitySample.Mvc/Views/Account/Register.cshtml
index 7d064f1b68..44e11d6955 100644
--- a/samples/IdentitySample.Mvc/Views/Account/Register.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/Register.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <h4>Create a new account.</h4>
diff --git a/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml b/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml
index 8ab27b68ea..343fcd8d33 100644
--- a/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="ResetPassword" method="post" class="form-horizontal" role="form">
     <h4>Reset your password.</h4>
diff --git a/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml b/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml
index 0c87629986..623166ced6 100644
--- a/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Send Verification Code";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="SendCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal" role="form">
     <input asp-for="RememberMe" type="hidden" />
diff --git a/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml b/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml
index 0b16cba7b2..7c74d72a23 100644
--- a/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Use recovery code";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="UseRecoveryCode" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <div asp-validation-summary="All" class="text-danger"></div>
diff --git a/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml b/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml
index a122eae8fa..f675dd1535 100644
--- a/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="VerifyAuthenticatorCode" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <div asp-validation-summary="All" class="text-danger"></div>
diff --git a/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml b/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml
index 3689cbba48..330a659ca7 100644
--- a/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="VerifyCode" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <div asp-validation-summary="All" class="text-danger"></div>
diff --git a/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml b/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml
index 1e09409ca7..40885f3832 100644
--- a/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Add Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <form asp-controller="Manage" asp-action="AddPhoneNumber" method="post" class="form-horizontal" role="form">
     <h4>Add a phone number.</h4>
     <hr />
diff --git a/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml b/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml
index 6127082df1..a8d076821b 100644
--- a/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Change Password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="ChangePassword" method="post" class="form-horizontal" role="form">
     <h4>Change Password Form</h4>
diff --git a/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml b/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml
index 00df7b2d60..080ccc10ea 100644
--- a/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Your recovery codes:";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">@ViewData["StatusMessage"]</p>
 
 <div>
diff --git a/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml b/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml
index 6e6ac54fa7..b91d3d8fd3 100644
--- a/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Manage your account";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">@ViewData["StatusMessage"]</p>
 
 <div>
diff --git a/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml b/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
index 1036a4f9e2..60c7811fa2 100644
--- a/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Manage your external logins";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <p class="text-success">@ViewData["StatusMessage"]</p>
 @if (Model.CurrentLogins.Count > 0)
diff --git a/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml b/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml
index 17787816be..076c20562c 100644
--- a/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="VerifyPhoneNumber" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal" role="form">
     <input asp-for="PhoneNumber" type="hidden" />
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
index 903896477c..7644f84c28 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Confirm email";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <div>
     <p>
         Thank you for confirming your email.
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
index 32e7cca627..d92664c31c 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4 id="external-login-title">Associate your @Model.ProviderDisplayName account.</h4>
 <hr />
 
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
index 3a9f190b6b..05659ba504 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Forgot your password?";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4>Enter your email.</h4>
 <hr />
 <div class="row">
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml
index b1139309eb..4f5ae991d1 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/ForgotPasswordConfirmation.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Forgot password confirmation";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <p>
     Please check your email to reset your password.
 </p>
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml
index 1e7a948453..b63e8533bc 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/Login.cshtml
@@ -5,7 +5,7 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <div class="row">
     <div class="col-md-4">
         <section>
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml
index 4346ab3327..b5508902f6 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/LoginWith2fa.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Two-factor authentication";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <hr />
 <p>Your login is protected with an authenticator app. Enter your authenticator code below.</p>
 <div class="row">
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml
index 3ba1a9addb..957f72b00f 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/LoginWithRecoveryCode.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Recovery code verification";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <hr />
 <p>
     You have requested to log in with a recovery code. This login will not be remembered until you provide
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
index 769f09a9c8..0d25109a32 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
@@ -6,7 +6,7 @@
 }
 
 <partial name="_StatusMessage" for="StatusMessage" />
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 
 <div class="alert alert-warning" role="alert">
     <p>
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml
index 2ccf27b2e0..226291193e 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/Register.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 
 <div class="row">
     <div class="col-md-4">
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
index 304e8010c1..3202efb8ec 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4>Reset your password.</h4>
 <hr />
 <div class="row">
diff --git a/src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml b/src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml
index a9972d4311..c52552f3e6 100644
--- a/src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml
+++ b/src/UI/Areas/Identity/Pages/V4/Account/ResetPasswordConfirmation.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Reset password confirmation";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <p>
     Your password has been reset. Please <a asp-page="./Login">click here to log in</a>.
 </p>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ConfirmEmail.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ConfirmEmail.cshtml
index f41619f893..16ddeb6a4d 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ConfirmEmail.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ConfirmEmail.cshtml
@@ -2,7 +2,7 @@
     ViewData["Title"] = "Confirm Email";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div>
     <p>
         Thank you for confirming your email. Please <a asp-controller="Account" asp-action="Login">click here to log in</a>.
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml
index 77c8d1bdc2..67f461be96 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>Associate your @ViewData["LoginProvider"] account.</h3>
 
 <form asp-controller="Account" asp-action="ExternalLoginConfirmation" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml
index d89339e012..20f7ce6565 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml
@@ -3,6 +3,6 @@
 }
 
 <header>
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-danger">Unsuccessful login with service.</p>
 </header>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml
index ab9bf44c8d..4642b6b680 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml
@@ -2,7 +2,7 @@
     ViewData["Title"] = "Forgot Password Confirmation";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p>
     Please check your email to reset your password.
 </p>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Login.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Login.cshtml
index ba14956bf7..e0f1d7005f 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Login.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Login.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <div class="row">
     <div class="col-md-8">
         <section>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Register.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Register.cshtml
index dad5ea2fb6..720265eb35 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Register.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Register.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
     <h4>Create a new account.</h4>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPassword.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPassword.cshtml
index 6e584da56d..0013f02d96 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPassword.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPassword.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="ResetPassword" method="post" class="form-horizontal">
     <h4>Reset your password.</h4>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/SendCode.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/SendCode.cshtml
index 729ea9ed99..1733b96f43 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/SendCode.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/SendCode.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Send Verification Code";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="SendCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal">
     <input asp-for="RememberMe" type="hidden" />
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/VerifyCode.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/VerifyCode.cshtml
index 52a4c736bb..bc29c76a39 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/VerifyCode.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/VerifyCode.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Account" asp-action="VerifyCode" asp-route-returnurl="@Model.ReturnUrl" method="post" class="form-horizontal">
     <div asp-validation-summary="All" class="text-danger"></div>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddLogoutUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddLogoutUri.cshtml
index 8ad387b930..b4c70eeafe 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddLogoutUri.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddLogoutUri.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a logout uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <ul class="list-unstyled">
             <li class="h4">Name</li>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddRedirectUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddRedirectUri.cshtml
index 6f2943df92..4e7a17e1c2 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddRedirectUri.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddRedirectUri.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a redirect uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <ul class="list-unstyled">
             <li class="h4">Name</li>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddScope.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddScope.cshtml
index 74d231f2c8..4369800da6 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddScope.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddScope.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a scope to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
     <ul class="list-unstyled">
         <li class="h4">Name</li>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Create.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Create.cshtml
index df2b292ea1..1c9dc6b408 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Create.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Create.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Create your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <form asp-action="Create" method="post">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml
index 930205a94c..e8ec8c2803 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a logout uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml
index 9f2d06bf91..7fbd0c82af 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a redirect uri to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateScope.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateScope.cshtml
index 971b6b588a..5866ac6fc7 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateScope.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateScope.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Add a scope to your application";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditScope.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditScope.cshtml
index 4b87172578..a4629f39a1 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditScope.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditScope.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Edit scope";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
     <ul class="list-unstyled">
         <li class="h4">Name</li>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml
index 50374fdde1..0e79809c8f 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Generate an application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml
index f3ee58b11a..e0cb8d8ce8 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Application key successfully generated";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <div>
         <hr />
         <ul class="list-unstyled">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Index.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Index.cshtml
index 459772e56b..e4b7f849c6 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Index.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Index.cshtml
@@ -3,7 +3,7 @@
         ViewData["Title"] = "Manage your applications";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <p class="text-success">@ViewData["StatusMessage"]</p>
 
     <div>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml
index 2d4bc5a755..7f85c9bf8e 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Regenerate an application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml
index 8a76dc87c7..b370f3c85f 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml
@@ -5,7 +5,7 @@
         ViewData["Title"] = "Remove the application key";
     }
 
-    <h2>@ViewData["Title"].</h2>
+    <h1>@ViewData["Title"].</h1>
     <hr />
 
     <ul class="list-unstyled">
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml
index 4025edb66a..945a96ce68 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml
@@ -3,5 +3,5 @@
 @{
     ViewData["Title"] = "Invalid logout redirect";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-warning">@Model.ErrorDescription</p>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/SignedOut.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/SignedOut.cshtml
index 43b6ce579a..c6bec5eb1a 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/SignedOut.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/SignedOut.cshtml
@@ -1,5 +1,5 @@
 @{
     ViewData["Title"] = "Signed Out";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">You have successfully signed out.</p>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml
index 5e96c6e218..37c1eddac8 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Add Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <form asp-controller="Manage" asp-action="AddPhoneNumber" method="post" class="form-horizontal">
     <h4>Add a phone number.</h4>
     <hr />
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ChangePassword.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ChangePassword.cshtml
index c9ef9a5ed7..28a2efc42a 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ChangePassword.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ChangePassword.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Change Password";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="ChangePassword" method="post" class="form-horizontal">
     <h4>Change Password</h4>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/Index.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/Index.cshtml
index 6582645969..98cded32cf 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/Index.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/Index.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Manage your account";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">@ViewData["StatusMessage"]</p>
 
 <div>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ManageLogins.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ManageLogins.cshtml
index 9e4cbcc9fb..b075eca6eb 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ManageLogins.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ManageLogins.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Manage your external logins";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <p class="text-success">@ViewData["StatusMessage"]</p>
 @if (Model.CurrentLogins.Count > 0)
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml
index e8b460ee4e..be49c93a8b 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml
@@ -3,7 +3,7 @@
     ViewData["Title"] = "Verify Phone Number";
 }
 
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 
 <form asp-controller="Manage" asp-action="VerifyPhoneNumber" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
     <input asp-for="PhoneNumber" type="hidden" />
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Account/SignedOut.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Account/SignedOut.cshtml
index 9e6b0f314b..47370348d2 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Account/SignedOut.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Account/SignedOut.cshtml
@@ -1,5 +1,5 @@
 @{
     ViewData["Title"] = "Signed Out";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <p class="text-success">You have successfully signed out.</p>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/About.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/About.cshtml
index 50476d1fbd..680d4b51be 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/About.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/About.cshtml
@@ -1,7 +1,7 @@
 @{
     ViewData["Title"] = "About";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>@ViewData["Message"]</h3>
 
 <p>Use this area to provide additional information.</p>
diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/Contact.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/Contact.cshtml
index 15c12c6d12..b06a159fcf 100644
--- a/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/Contact.cshtml
+++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Views/Home/Contact.cshtml
@@ -1,7 +1,7 @@
 @{
     ViewData["Title"] = "Contact";
 }
-<h2>@ViewData["Title"].</h2>
+<h1>@ViewData["Title"].</h1>
 <h3>@ViewData["Message"]</h3>
 
 <address>