diff --git a/src/Idmt.Plugin/Services/IdmtLinkGenerator.cs b/src/Idmt.Plugin/Services/IdmtLinkGenerator.cs
index f1fa4dc..289ee3f 100644
--- a/src/Idmt.Plugin/Services/IdmtLinkGenerator.cs
+++ b/src/Idmt.Plugin/Services/IdmtLinkGenerator.cs
@@ -31,6 +31,7 @@ public string GenerateConfirmEmailApiLink(string email, string token)
 
         var routeValues = new RouteValueDictionary()
         {
+            [GetTenantRouteParameter()] = multiTenantContextAccessor.MultiTenantContext?.TenantInfo?.Identifier ?? string.Empty,
             ["tenantIdentifier"] = multiTenantContextAccessor.MultiTenantContext?.TenantInfo?.Identifier ?? string.Empty,
             ["email"] = email,
             ["token"] = token,
@@ -61,6 +62,7 @@ public string GenerateConfirmEmailFormLink(string email, string token)
 
         var queryParams = new Dictionary<string, string?>
         {
+            [GetTenantRouteParameter()] = multiTenantContextAccessor.MultiTenantContext?.TenantInfo?.Identifier ?? string.Empty,
             ["tenantIdentifier"] = multiTenantContextAccessor.MultiTenantContext?.TenantInfo?.Identifier ?? string.Empty,
             ["email"] = email,
             ["token"] = token,
@@ -85,6 +87,7 @@ public string GeneratePasswordResetApiLink(string email, string token)
         // Generate password setup URL
         var routeValues = new RouteValueDictionary()
         {
+            [GetTenantRouteParameter()] = multiTenantContextAccessor.MultiTenantContext?.TenantInfo?.Identifier ?? string.Empty,
             ["tenantIdentifier"] = multiTenantContextAccessor.MultiTenantContext?.TenantInfo?.Identifier ?? string.Empty,
             ["email"] = email,
             ["token"] = token,
@@ -118,6 +121,7 @@ public string GeneratePasswordResetFormLink(string email, string token)
 
         var queryParams = new Dictionary<string, string?>
         {
+            [GetTenantRouteParameter()] = multiTenantContextAccessor.MultiTenantContext?.TenantInfo?.Identifier ?? string.Empty,
             ["tenantIdentifier"] = multiTenantContextAccessor.MultiTenantContext?.TenantInfo?.Identifier ?? string.Empty,
             ["email"] = email,
             ["token"] = token,
@@ -131,4 +135,7 @@ public string GeneratePasswordResetFormLink(string email, string token)
 
         return uri;
     }
+
+    private string GetTenantRouteParameter() =>
+        options.Value.MultiTenant.StrategyOptions.GetValueOrDefault(IdmtMultiTenantStrategy.Route, IdmtMultiTenantStrategy.DefaultRouteParameter);
 }
\ No newline at end of file