diff --git a/src/Core/MailTemplates/Razor/Welcome.cshtml b/src/Core/MailTemplates/Razor/Welcome.cshtml
index 0d51b2e780..799cb122ed 100644
--- a/src/Core/MailTemplates/Razor/Welcome.cshtml
+++ b/src/Core/MailTemplates/Razor/Welcome.cshtml
@@ -96,7 +96,7 @@
                 </tr>
                 <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
                     <td class="content-block h3 biglink aligncenter" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: bold; line-height: 25px; margin: 0; padding: 0 0 10px;" align="center" valign="top">
-                        <a target="_blank" href="@Raw(Model.WebVaultUrl)/?utm_source=welcome_email&utm_medium=email" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 20px; line-height: 25px; margin: 0; text-decoration: underline;">vault.bitwarden.com</a>
+                        <a target="_blank" href="@Raw(Model.WebVaultUrl)/?utm_source=welcome_email&utm_medium=email" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #3c8dbc; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 20px; line-height: 25px; margin: 0; text-decoration: underline;">@Raw(Model.WebVaultUrlHostname)</a>
                     </td>
                 </tr>
                 <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">
diff --git a/src/Core/Models/Mail/BaseMailModel.cs b/src/Core/Models/Mail/BaseMailModel.cs
index 8d3e2dd342..8f0ca3daf0 100644
--- a/src/Core/Models/Mail/BaseMailModel.cs
+++ b/src/Core/Models/Mail/BaseMailModel.cs
@@ -1,8 +1,22 @@
-namespace Bit.Core.Models.Mail
+using System;
+
+namespace Bit.Core.Models.Mail
 {
     public class BaseMailModel
     {
         public string SiteName { get; set; }
         public string WebVaultUrl { get; set; }
+        public string WebVaultUrlHostname
+        {
+            get
+            {
+                if(Uri.TryCreate(WebVaultUrl, UriKind.Absolute, out Uri uri))
+                {
+                    return uri.Host;
+                }
+
+                return WebVaultUrl;
+            }
+        }
     }
 }