- 
+ 
|
@@ -119,12 +119,21 @@
+
+ |
+ © {{CurrentYear}} Bitwarden Inc.
+ |
+
diff --git a/src/Core/MailTemplates/Handlebars/Layouts/Full.text.hbs b/src/Core/MailTemplates/Handlebars/Layouts/Full.text.hbs
index 5dfe60e037..bf4ec50796 100644
--- a/src/Core/MailTemplates/Handlebars/Layouts/Full.text.hbs
+++ b/src/Core/MailTemplates/Handlebars/Layouts/Full.text.hbs
@@ -3,5 +3,11 @@
----------------------------
- Twitter: https://twitter.com/bitwarden
+- Reddit: https://www.reddit.com/r/Bitwarden/
+- Community Forums: https://community.bitwarden.com/
+- GitHub: https://github.com/bitwarden
+- Youtube: https://www.youtube.com/channel/UCId9a_jQqvJre0_dE2lE_Rw
+- LinkedIn: https://www.linkedin.com/company/bitwarden1/
- Facebook: https://www.facebook.com/bitwarden/
-- GitHub: https://github.com/bitwarden
\ No newline at end of file
+
+{{CurrentYear}} Bitwarden Inc.
\ No newline at end of file
diff --git a/src/Core/MailTemplates/Handlebars/Welcome.html.hbs b/src/Core/MailTemplates/Handlebars/Welcome.html.hbs
index 52ae1ce5a0..ed16594347 100644
--- a/src/Core/MailTemplates/Handlebars/Welcome.html.hbs
+++ b/src/Core/MailTemplates/Handlebars/Welcome.html.hbs
@@ -1,91 +1,73 @@
{{#>FullHtmlLayout}}
- |
- Thank you for creating an account with Bitwarden. You may now log in with your new account.
- |
-
-
- |
- Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on:
- |
-
-
- |
- Desktop
- |
-
-
- |
- Access Bitwarden on Windows, macOS, and Linux desktops with our native desktop application.
- |
-
-
-
-
- 
-
- |
-
-
- |
- Web Browser
- |
-
-
- |
- Integrate Bitwarden directly into your favorite browser. Use our browser extensions for a seamless browsing experience.
- |
-
-
-
-
- 
-
- |
-
-
- |
- Mobile
- |
-
-
- |
- Take Bitwarden on the go with our mobile apps for your phone or tablet device.
- |
-
-
-
-
- 
-
- |
-
-
- |
- Web
- |
-
-
- |
- Stuck without any of your devices? Using a friend's computer? You can access your Bitwarden vault from any web enabled device by using the web vault.
- |
-
-
- |
- {{{WebVaultUrlHostname}}}
+ |
+ Welcome to Bitwarden and thank you for creating an account! Now you can extend robust security to all of your online experiences and devices.
|
- |
- If you have any questions or problems you can email us from our website at https://bitwarden.com/contact.
+ |
+ Your Master Password is the only way you can unlock the Vault and only you hold the key. Memorize it, or write it down and keep it in a safe place.
|
-
- Thank you!
+ |
+
+ Get Started: Install Bitwarden
+ |
+
+
+
+ You can access the Bitwarden Vault from anywhere and any device at {{{WebVaultUrlHostname}}}! You can also download and install Bitwarden on any desktop, device, and browser.
+
+
+ |
+
+
+
+
+ 
+
+ |
+
+
+
+
+ Securely Share with Bitwarden Organizations
+ |
+
+
+
+ Bitwarden makes it easy to securely share passwords for teams and enterprises through Organizations. Join an Organization if invited, or launch a new one anytime from the Web Vault with the + New Organization button.
+
+
+ |
+
+
+ |
+
+ |
+
+
+
+
+ We're Here for You
+ |
+
+
+
+ Check out our Help site for documentation, join the Bitwarden Community forums and connect with other enthusiasts on Reddit. If you have any questions or issues, contact us.
+
+
+ |
+
+
+
+ Stay safe and secure,
The Bitwarden Team
|
diff --git a/src/Core/MailTemplates/Handlebars/Welcome.text.hbs b/src/Core/MailTemplates/Handlebars/Welcome.text.hbs
index 536a14241d..59dde954a4 100644
--- a/src/Core/MailTemplates/Handlebars/Welcome.text.hbs
+++ b/src/Core/MailTemplates/Handlebars/Welcome.text.hbs
@@ -1,35 +1,39 @@
{{#>FullTextLayout}}
-Thank you for creating an account with Bitwarden. You may now log in with your new account.
+Welcome to Bitwarden and thank you for creating an account! Now you can extend robust security to all of your online experiences and devices.
-Did you know that Bitwarden is free to sync with all of your devices? Download Bitwarden today on:
+Your Master Password is the only way you can unlock the Vault and only you hold the key. Memorize it, or write it down and keep it in a safe place.
-Desktop
+
+Get Started: Install Bitwarden
============
-Access Bitwarden on Windows, macOS, and Linux desktops with our native desktop application.
-https://bitwarden.com/#download
+You can access the Bitwarden Vault from anywhere and any device at the web vault ({{WebVaultUrl}}/?utm_source=welcome_email&utm_medium=email). You can also download and install Bitwarden on any desktop, device and browser (http://www.bitwarden.com/download).
-Web Browser
+
+Download Options
============
-Integrate Bitwarden directly into your favorite browser. Use our browser extensions for a seamless browsing experience.
-https://bitwarden.com/#download-browser
+http://www.bitwarden.com/download
-Mobile
+
+Securely Share with Bitwarden Organizations
============
-Take Bitwarden on the go with our mobile apps for your phone or tablet device.
-https://bitwarden.com/#download-mobile
+Bitwarden makes it easy to securely share passwords for teams and enterprises through Organizations. Join an Organization if invited, or launch a new one anytime from the Web Vault ({{WebVaultUrl}}/?utm_source=welcome_email&utm_medium=email) with the + New Organization button.
-Web
+
+Login to Bitwarden
============
-Stuck without any of your devices? Using a friend's computer? You can access your Bitwarden vault from any web enabled device by using the web vault.
{{WebVaultUrl}}/?utm_source=welcome_email&utm_medium=email
-If you have any questions or problems you can email us from our website at: https://bitwarden.com/contact/?utm_source=welcome_email&utm_medium=email
+We're here for you
+============
-Thank you!
+Check out our Help (http://www.bitwarden.com/help) site for documentation, join the Bitwarden Community forums (https://community.bitwarden.com/) and connect with other enthusiasts on Reddit (https://www.reddit.com/r/Bitwarden/). If you have any questions or issues, contact us (http://www.bitwarden.com/contact).
+
+
+Stay safe and secure,
The Bitwarden Team
{{/FullTextLayout}}
\ No newline at end of file
diff --git a/src/Core/Models/Mail/BaseMailModel.cs b/src/Core/Models/Mail/BaseMailModel.cs
index c1c439706c..82c70274b3 100644
--- a/src/Core/Models/Mail/BaseMailModel.cs
+++ b/src/Core/Models/Mail/BaseMailModel.cs
@@ -18,5 +18,12 @@ namespace Bit.Core.Models.Mail
return WebVaultUrl;
}
}
+ public string CurrentYear
+ {
+ get
+ {
+ return DateTime.UtcNow.Year.ToString();
+ }
+ }
}
}
diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs
index 6256f5ccea..322c47b3c7 100644
--- a/src/Core/Services/Implementations/HandlebarsMailService.cs
+++ b/src/Core/Services/Implementations/HandlebarsMailService.cs
@@ -202,7 +202,7 @@ namespace Bit.Core.Services
public async Task SendWelcomeEmailAsync(User user)
{
- var message = CreateDefaultMessage("Welcome", user.Email);
+ var message = CreateDefaultMessage("Welcome to Bitwarden!", user.Email);
var model = new BaseMailModel
{
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
