diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs
index 03f975b0ac..905148ff38 100644
--- a/src/Core/Services/Implementations/HandlebarsMailService.cs
+++ b/src/Core/Services/Implementations/HandlebarsMailService.cs
@@ -418,7 +418,7 @@ namespace Bit.Core.Services
             var message = CreateDefaultMessage("Master Password Has Been Changed", email);
             var model = new AdminResetPasswordViewModel()
             {
-                UserName = CoreHelpers.SanitizeForEmail(userName),
+                UserName = GetUserIdentifier(email, userName),
                 OrgName = CoreHelpers.SanitizeForEmail(orgName),
             };
             await AddMessageContentAsync(message, "AdminResetPassword", model);
@@ -766,7 +766,7 @@ namespace Bit.Core.Services
             var message = CreateDefaultMessage("Master Password Has Been Changed", email);
             var model = new UpdateTempPasswordViewModel()
             {
-                UserName = CoreHelpers.SanitizeForEmail(userName)
+                UserName = GetUserIdentifier(email, userName)
             };
             await AddMessageContentAsync(message, "UpdatedTempPassword", model);
             message.Category = "UpdatedTempPassword";
@@ -886,5 +886,10 @@ namespace Bit.Core.Services
             message.Category = "FailedTwoFactorAttempts";
             await _mailDeliveryService.SendEmailAsync(message);
         }
+
+        private static string GetUserIdentifier(string email, string userName)
+        {
+            return string.IsNullOrEmpty(userName) ? email : CoreHelpers.SanitizeForEmail(userName, false);
+        }
     }
 }
diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs
index ced91ce6b6..73077665e4 100644
--- a/src/Core/Services/Implementations/UserService.cs
+++ b/src/Core/Services/Implementations/UserService.cs
@@ -794,7 +794,7 @@ namespace Bit.Core.Services
             user.ForcePasswordReset = true;
 
             await _userRepository.ReplaceAsync(user);
-            await _mailService.SendAdminResetPasswordEmailAsync(user.Email, user.Name ?? user.Email, org.Name);
+            await _mailService.SendAdminResetPasswordEmailAsync(user.Email, user.Name, org.Name);
             await _eventService.LogOrganizationUserEventAsync(orgUser, EventType.OrganizationUser_AdminResetPassword);
             await _pushService.PushLogOutAsync(user.Id);
 
@@ -820,7 +820,7 @@ namespace Bit.Core.Services
             user.MasterPasswordHint = hint;
 
             await _userRepository.ReplaceAsync(user);
-            await _mailService.SendUpdatedTempPasswordEmailAsync(user.Email, user.Name ?? user.Email);
+            await _mailService.SendUpdatedTempPasswordEmailAsync(user.Email, user.Name);
             await _eventService.LogUserEventAsync(user.Id, EventType.User_UpdatedTempPassword);
             await _pushService.PushLogOutAsync(user.Id);