diff --git a/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml
index 3f15aaca23..4041597249 100644
--- a/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml
+++ b/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml
@@ -5,7 +5,7 @@
 }
 
 <h4>@ViewData["Title"]</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <div class="row">
     <div class="col-md-6">
         <form method="post">
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
index 878f3afdde..7a51107ec1 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
@@ -5,7 +5,7 @@
 }
 
 <h4>@ViewData["Title"]</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <div class="row">
     <div class="col-md-6">
         <form id="change-password-form" method="post">
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
index e2126672e2..769f09a9c8 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
@@ -5,7 +5,7 @@
     ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <h2>@ViewData["Title"]</h2>
 
 <div class="alert alert-warning" role="alert">
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
index 67debf1fc9..5c68aa568f 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
@@ -5,7 +5,7 @@
     ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <h4>@ViewData["Title"]</h4>
 <div>
     <p>To use an authenticator app go through the following steps:</p>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
index b5592871e6..8ad0807a88 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Manage your external logins";
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 @if (Model.CurrentLogins?.Count > 0)
 {
     <h4>Registered Logins</h4>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
index ffc8d678ef..4a0bc7480e 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
@@ -5,7 +5,7 @@
     ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <h4>@ViewData["Title"]</h4>
 <div class="alert alert-warning" role="alert">
     <p>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
index c7d3da0bd6..88578b4018 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml
@@ -5,7 +5,7 @@
 }
 
 <h4>@ViewData["Title"]</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <div class="row">
     <div class="col-md-6">
         <form id="profile-form" method="post">
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
index 334754cfa4..ddd368ef05 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
@@ -5,7 +5,7 @@
     ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <h4>@ViewData["Title"]</h4>
 <div class="alert alert-warning" role="alert">
     <p>
@@ -21,4 +21,4 @@
     <form id="reset-authenticator-form" method="post" class="form-group">
         <button id="reset-authenticator-button" class="btn btn-danger" type="submit">Reset authenticator key</button>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
index 02d35209f3..b22c0f0e6c 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
@@ -6,7 +6,7 @@
 }
 
 <h4>Set your password</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <p class="text-info">
     You do not have a local username/password for this site. Add a local
     account so you can log in without an external login.
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml
index 72d4a7025b..9970402b04 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml
@@ -5,7 +5,7 @@
     ViewData["ActivePage"] = "TwoFactorAuthentication";
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <h4>@ViewData["Title"]</h4>
 <div class="alert alert-warning" role="alert">
     <p>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
index d03b52f0d0..ed4af0874e 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "Two-factor authentication (2FA)";
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial name="_StatusMessage" for="StatusMessage" />
 <h4>@ViewData["Title"]</h4>
 @if (Model.Is2faEnabled)
 {
@@ -53,4 +53,4 @@ else
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
\ No newline at end of file
+}