diff --git a/src/lib/services/email-service.ts b/src/lib/services/email-service.ts
index bdf2396843..8c2d1955ed 100644
--- a/src/lib/services/email-service.ts
+++ b/src/lib/services/email-service.ts
@@ -430,6 +430,9 @@ export class EmailService {
             let gettingStartedTemplate = 'getting-started';
             if (this.flagResolver.isEnabled('newGettingStartedEmail')) {
                 gettingStartedTemplate = 'getting-started-new';
+                if (passwordLink === unleashUrl) {
+                    delete context.passwordLink;
+                }
             }
 
             const bodyHtml = await this.compileTemplate(