diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/SignedOut.cshtml.cs b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/SignedOut.cshtml.cs
index ec39e5f35e..e364f34001 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/SignedOut.cshtml.cs
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/SignedOut.cshtml.cs
@@ -5,16 +5,19 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-public class SignedOutModel : PageModel
+namespace Company.WebApplication1.Pages.Account
 {
-    public IActionResult OnGet()
+    public class SignedOutModel : PageModel
     {
-        if (User.Identity.IsAuthenticated)
+        public IActionResult OnGet()
         {
-            // Redirect to home page if the user is authenticated.
-            return RedirectToPage("/Index");
-        }
+            if (User.Identity.IsAuthenticated)
+            {
+                // Redirect to home page if the user is authenticated.
+                return RedirectToPage("/Index");
+            }
 
-        return Page();
+            return Page();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/_ViewImports.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/_ViewImports.cshtml
index 7fdcd89164..62bba96564 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/_ViewImports.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/_ViewImports.cshtml
@@ -5,5 +5,8 @@
 @*#if (IndividualLocalAuth)
 @using Company.WebApplication1.Data
 #endif*@
+@*#if (OrganizationalAuth || IndividualB2CAuth)
+@using Company.WebApplication1.Pages.Account
+#endif*@
 @namespace Company.WebApplication1.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers