From b1a4ae35a6c78ec353ec0a8b0aea36b7c8e8afbc Mon Sep 17 00:00:00 2001
From: Joshua Henninger <joshua@triumph.tech>
Date: Thu, 14 Sep 2023 17:01:14 -0700
Subject: [PATCH] - (Core) Fixed issue with invalid Confirm Account URL sent
 from new Login block. (Fixes #5580)

---
 Rock.Blocks/Security/Login.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rock.Blocks/Security/Login.cs b/Rock.Blocks/Security/Login.cs
index 894ea0b089c..050e6afb8fc 100644
--- a/Rock.Blocks/Security/Login.cs
+++ b/Rock.Blocks/Security/Login.cs
@@ -1133,7 +1133,7 @@ private void SendConfirmation( UserLogin userLogin )
 
                 var mergeFields = GetMergeFields( new Dictionary<string, object>
                 {
-                    { "ConfirmAccountUrl", RequestContext.RootUrlPath + url.TrimStart( '/' ) },
+                    { "ConfirmAccountUrl", RequestContext.RootUrlPath.EnsureTrailingForwardslash() + url.RemoveLeadingForwardslash() },
                     { "Person", userLogin.Person },
                     { "User", userLogin }
                 } );