[PM-35300] fix emails do not match figma by JaredScar · Pull Request #7609 · bitwarden/server

JaredScar · 2026-05-11T16:18:48Z

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-35300

📔 Objective

Fixes rest of email changes to match figmas that I originally missed because figma was zoomed in... 😬

📸 Screenshots

Reset 2FA and MP

Reset 2FA

Reset MP

…e message - Updated Handlebars and MJML templates for the admin reset password email to improve clarity and user instructions. - Enhanced the text version to provide step-by-step recovery instructions. - Modified the email service to reflect the organization name in the email subject line.

…-35300-emails-do-not-match-figma

…arity

…readability

… to the model for improved context and user experience.

…idance - Updated text and Handlebars templates to improve messaging around account recovery steps. - Adjusted links to direct users appropriately based on password reset status.

…overy link logic - Modified Handlebars and MJML templates to adjust the recovery link based on the two-factor reset status. - Ensured consistency in messaging across HTML and text versions of the email.

eliykat

Please fix conflicts and then re-request reviews.

Can you provide more info about what you've changed after #7592?

coroiu

Changes are fine by me, but yeah, re-request when conflicts are fixed

…-35300-fix-emails-do-not-match-figma

github-actions · 2026-05-12T15:49:10Z

🤖 Bitwarden Claude Code Review

Overall Assessment: APPROVE

This PR updates the admin account-recovery email templates (MJML source, compiled HTML, and plain-text) to align all three reset scenarios with Figma: the two-step-login-only headline is reworded, a conditional "Log in to Bitwarden" step is inserted when only 2FA is reset, and the "Recover your account" button deep-links to /settings/security/two-factor when two-step login was reset. The follow-up commit also switches the bolded {{UserName}} token in HandlebarsMailService.SendAdminResetPasswordEmailAsync to use the user's email directly so the rendered output matches the Figma. Conditional branches render consistent copy across MJML, HTML, and text, and the ordered-list numbering is correct in all three scenarios. Reviewer confirmed in-thread that the conditional button URLs render as expected.

No findings.

codecov · 2026-05-12T16:15:37Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 59.82%. Comparing base (291ddfd) to head (ef5e85a).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7609      +/-   ##
==========================================
- Coverage   59.82%   59.82%   -0.01%     
==========================================
  Files        2119     2119              
  Lines       93354    93354              
  Branches     8282     8282              
==========================================
- Hits        55849    55845       -4     
- Misses      35522    35527       +5     
+ Partials     1983     1982       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

JaredScar · 2026-05-12T17:48:12Z

Please fix conflicts and then re-request reviews.

Can you provide more info about what you've changed after #7592?

Apologies! Yes, I needed to make this PR because my initial PR did not cover all the emails... I had saw the linked Figma only showing 1 email to change, but didn't realize there were 2 others within the Figma via zooming out. This PR accounts for those missed email figmas. Sorry about that

JimmyVo16

The code looks good.

As a sanity check, can you just make sure the link was generated correctly since it’s in a conditional?

JaredScar · 2026-05-12T22:18:10Z

The code looks good.

As a sanity check, can you just make sure the link was generated correctly since it’s in a conditional?

Clarified in Jimmy's DMs, but just for visibility here too! The URLs can be seen in the bottom of screenshots for where the button actually has a valid reroute that is different from just a login URL

eliykat

Removing my review as @JimmyVo16 has it handled

…-35300-fix-emails-do-not-match-figma

…overy

sonarqubecloud · 2026-05-13T18:01:08Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

JaredScar · 2026-05-13T18:12:29Z

Regarding the email in the emails. The originally screenshots I posted include just the username prefix with no @email.com at the end. The figmas say email.com. I spoke to Jillian via Slack asking about this. She confirmed we should show the @email.com suffix too, so I have resolved that.

dereknance

Platform changes look good.

JaredScar added 7 commits May 5, 2026 14:13

Merge branch 'main' of https://github.com/bitwarden/server into ac/pm…

6b61712

…-35300-emails-do-not-match-figma

Update admin reset password email template to adjust font size for cl…

614d1cd

…arity

Adjust font size in admin reset password email template for improved …

5854cdc

…readability

Enhance admin reset password email by adding WebVaultUrl and SiteName…

4c7d259

… to the model for improved context and user experience.

Refactor admin reset password email templates for clarity and user gu…

1d1e736

…idance - Updated text and Handlebars templates to improve messaging around account recovery steps. - Adjusted links to direct users appropriately based on password reset status.

Update admin reset password email templates to reflect changes in rec…

4d48ad6

…overy link logic - Modified Handlebars and MJML templates to adjust the recovery link based on the two-factor reset status. - Ensured consistency in messaging across HTML and text versions of the email.

JaredScar requested review from a team as code owners May 11, 2026 16:18

JaredScar requested a review from coroiu May 11, 2026 16:18

JaredScar added the ai-review Request a Claude code review label May 11, 2026

JaredScar requested a review from eliykat May 11, 2026 16:18

eliykat reviewed May 11, 2026

View reviewed changes

coroiu previously approved these changes May 12, 2026

View reviewed changes

Merge branch 'main' of https://github.com/bitwarden/server into ac/pm…

ee10af8

…-35300-fix-emails-do-not-match-figma

JaredScar dismissed coroiu’s stale review via ee10af8 May 12, 2026 15:48

JaredScar requested review from coroiu and eliykat May 12, 2026 17:47

JimmyVo16 previously approved these changes May 12, 2026

View reviewed changes

eliykat removed their request for review May 13, 2026 04:04

eliykat reviewed May 13, 2026

View reviewed changes

coroiu previously approved these changes May 13, 2026

View reviewed changes

JaredScar added 2 commits May 13, 2026 13:22

Merge branch 'main' of https://github.com/bitwarden/server into ac/pm…

85a4095

…-35300-fix-emails-do-not-match-figma

Update HandlebarsMailService to use email as UserName for account rec…

ef5e85a

…overy

JaredScar dismissed stale reviews from coroiu and JimmyVo16 via ef5e85a May 13, 2026 17:55

JaredScar requested review from JimmyVo16 and coroiu May 13, 2026 18:20

JimmyVo16 approved these changes May 13, 2026

View reviewed changes

dereknance approved these changes May 14, 2026

View reviewed changes

JaredScar merged commit dd4acb6 into main May 14, 2026
45 checks passed

JaredScar deleted the ac/pm-35300-fix-emails-do-not-match-figma branch May 14, 2026 15:32

djsmith85 added the t:bugfix Change Type - Bugfix label May 29, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PM-35300] fix emails do not match figma#7609

[PM-35300] fix emails do not match figma#7609
JaredScar merged 10 commits into
mainfrom
ac/pm-35300-fix-emails-do-not-match-figma

JaredScar commented May 11, 2026

Uh oh!

eliykat left a comment

Uh oh!

coroiu left a comment

Uh oh!

github-actions Bot commented May 12, 2026 •

edited

Loading

Uh oh!

codecov Bot commented May 12, 2026 •

edited

Loading

Uh oh!

JaredScar commented May 12, 2026

Uh oh!

JimmyVo16 left a comment

Uh oh!

JaredScar commented May 12, 2026

Uh oh!

eliykat left a comment

Uh oh!

sonarqubecloud Bot commented May 13, 2026

Uh oh!

JaredScar commented May 13, 2026

Uh oh!

dereknance left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

JaredScar commented May 11, 2026

🎟️ Tracking

📔 Objective

📸 Screenshots

Uh oh!

eliykat left a comment

Choose a reason for hiding this comment

Uh oh!

coroiu left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented May 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤖 Bitwarden Claude Code Review

Uh oh!

codecov Bot commented May 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

JaredScar commented May 12, 2026

Uh oh!

JimmyVo16 left a comment

Choose a reason for hiding this comment

Uh oh!

JaredScar commented May 12, 2026

Uh oh!

eliykat left a comment

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud Bot commented May 13, 2026

Quality Gate passed

Uh oh!

JaredScar commented May 13, 2026

Uh oh!

dereknance left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

github-actions Bot commented May 12, 2026 •

edited

Loading

codecov Bot commented May 12, 2026 •

edited

Loading