diff --git a/src/Core/MailTemplates/Markdown/Welcome.md b/src/Core/MailTemplates/Markdown/Welcome.md
index 89d72ce2a..08901e76a 100644
--- a/src/Core/MailTemplates/Markdown/Welcome.md
+++ b/src/Core/MailTemplates/Markdown/Welcome.md
@@ -23,6 +23,9 @@ Desktop
 ## Opera Extension
 <https://addons.opera.com/extensions/details/bitwarden-free-password-manager/?utm_source=welcome_email&utm_medium=email>
 
+## Edge Extension
+<https://www.microsoft.com/store/p/bitwarden-free-password-manager/9p6kxl0svnnl>
+
 Web
 ============
 
diff --git a/src/Core/MailTemplates/Razor/Welcome.cshtml b/src/Core/MailTemplates/Razor/Welcome.cshtml
index 5f2968b7b..0d51b2e78 100644
--- a/src/Core/MailTemplates/Razor/Welcome.cshtml
+++ b/src/Core/MailTemplates/Razor/Welcome.cshtml
@@ -48,9 +48,10 @@
                     <td 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;" valign="top">
                         <table width="100%" cellpadding="0" cellspacing="0" 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;">
                             <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="aligncenter" width="33%" 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;" align="center" valign="top">Chrome</td>
-                                <td class="aligncenter" width="34%" 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;" align="center" valign="top">Firefox</td>
-                                <td class="aligncenter" width="33%" 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;" align="center" valign="top">Opera</td>
+                                <td class="aligncenter" width="25%" 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;" align="center" valign="top">Chrome</td>
+                                <td class="aligncenter" width="25%" 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;" align="center" valign="top">Firefox</td>
+                                <td class="aligncenter" width="25%" 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;" align="center" valign="top">Opera</td>
+                                <td class="aligncenter" width="25%" 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;" align="center" valign="top">Edge</td>
                             </tr>
                         </table>
                     </td>
@@ -59,21 +60,26 @@
                     <td class="content-block" 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; padding: 0 0 10px;" valign="top">
                         <table width="100%" cellpadding="0" cellspacing="0" 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;">
                             <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 valign="middle" class="aligncenter middle" width="33%" 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;" align="center">
+                                <td valign="middle" class="aligncenter middle" width="25%" 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;" align="center">
                                     <a href="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb?utm_source=welcome_email&utm_medium=email" title="Get bitwarden for Chrome" target="_blank" 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: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
                                         <img width="53" height="54" alt="Chrome Extension" src="https://bitwarden.com/images/chrome.png" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
                                     </a>
                                 </td>
-                                <td valign="middle" class="aligncenter middle" width="34%" 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;" align="center">
+                                <td valign="middle" class="aligncenter middle" width="25%" 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;" align="center">
                                     <a href="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/" title="Get bitwarden for Firefox" target="_blank" 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: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
                                         <img width="57" height="54" alt="Firefox Extension" src="https://bitwarden.com/images/firefox.png" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
                                     </a>
                                 </td>
-                                <td valign="middle" class="aligncenter middle" width="33%" 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;" align="center">
+                                <td valign="middle" class="aligncenter middle" width="25%" 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;" align="center">
                                     <a href="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/?utm_source=welcome_email&utm_medium=email" title="Get bitwarden for Opera" target="_blank" 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: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
                                         <img width="53" height="54" alt="Opera Extension" src="https://bitwarden.com/images/opera.png" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
                                     </a>
                                 </td>
+                                <td valign="middle" class="aligncenter middle" width="25%" 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;" align="center">
+                                    <a href="https://www.microsoft.com/store/p/bitwarden-free-password-manager/9p6kxl0svnnl" title="Get bitwarden for Edge" target="_blank" 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: 16px; line-height: 25px; margin: 0; text-decoration: underline;">
+                                        <img width="52" height="54" alt="Edge Extension" src="https://bitwarden.com/images/edge.png" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" />
+                                    </a>
+                                </td>
                             </tr>
                         </table>
                     </td>
diff --git a/src/Core/MailTemplates/Razor/Welcome.text.cshtml b/src/Core/MailTemplates/Razor/Welcome.text.cshtml
index 67924e26d..a60875319 100644
--- a/src/Core/MailTemplates/Razor/Welcome.text.cshtml
+++ b/src/Core/MailTemplates/Razor/Welcome.text.cshtml
@@ -27,6 +27,9 @@ https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/
 ## Opera Extension
 https://addons.opera.com/extensions/details/bitwarden-free-password-manager/?utm_source=welcome_email&utm_medium=email
 
+## Edge Extension
+https://www.microsoft.com/store/p/bitwarden-free-password-manager/9p6kxl0svnnl
+
 Web
 ============
 
diff --git a/src/Core/MailTemplates/Razor/_MailLayout.cshtml b/src/Core/MailTemplates/Razor/_MailLayout.cshtml
index 59d1cd0ba..b069ab526 100644
--- a/src/Core/MailTemplates/Razor/_MailLayout.cshtml
+++ b/src/Core/MailTemplates/Razor/_MailLayout.cshtml
@@ -120,6 +120,7 @@
                                                 <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://twitter.com/bitwarden_app" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-twitter.png" alt="Twitter" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
                                                 <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://www.facebook.com/bitwarden/" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-facebook.png" alt="Facebook" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
                                                 <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://plus.google.com/114869903467947368993" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-gplus.png" alt="Google+" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
+                                                <td style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; padding: 0 10px;" valign="top"><a href="https://github.com/bitwarden" target="_blank" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; line-height: 20px; margin: 0; text-decoration: underline;"><img src="https://bitwarden.com/images/mail-github.png" alt="GitHub" width="30" height="30" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0; max-width: 100%;" /></a></td>
                                             </tr>
                                         </table>
                                     </td>
diff --git a/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml b/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml
index 235352b92..a976f0165 100644
--- a/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml
+++ b/src/Core/MailTemplates/Razor/_MailLayout.text.cshtml
@@ -5,4 +5,5 @@
 
 - Twitter: https://twitter.com/bitwarden_app
 - Facebook: https://www.facebook.com/bitwarden/
-- Google+: https://plus.google.com/114869903467947368993
\ No newline at end of file
+- Google+: https://plus.google.com/114869903467947368993
+- GitHub: https://github.com/bitwarden
\ No newline at end of file
diff --git a/util/Mail/wwwroot/templates/welcome.html b/util/Mail/wwwroot/templates/welcome.html
index f82a3819d..d08d994e4 100644
--- a/util/Mail/wwwroot/templates/welcome.html
+++ b/util/Mail/wwwroot/templates/welcome.html
@@ -65,9 +65,10 @@
                                                 <td>
                                                     <table width="100%" cellpadding="0" cellspacing="0">
                                                         <tr>
-                                                            <td class="aligncenter" width="33%">Chrome</td>
-                                                            <td class="aligncenter" width="34%">Firefox</td>
-                                                            <td class="aligncenter" width="33%">Opera</td>
+                                                            <td class="aligncenter" width="25%">Chrome</td>
+                                                            <td class="aligncenter" width="25%">Firefox</td>
+                                                            <td class="aligncenter" width="25%">Opera</td>
+                                                            <td class="aligncenter" width="25%">Edge</td>
                                                         </tr>
                                                     </table>
                                                 </td>
@@ -76,21 +77,26 @@
                                                 <td class="content-block">
                                                     <table width="100%" cellpadding="0" cellspacing="0">
                                                         <tr>
-                                                            <td valign="middle" class="aligncenter middle" width="33%">
+                                                            <td valign="middle" class="aligncenter middle" width="25%">
                                                                 <a href="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb?utm_source=welcome_email&utm_medium=email" title="Get bitwarden for Chrome" target="_blank">
                                                                     <img width="53" height="54" alt="Chrome Extension" src="https://bitwarden.com/images/chrome.png" />
                                                                 </a>
                                                             </td>
-                                                            <td valign="middle" class="aligncenter middle" width="34%">
+                                                            <td valign="middle" class="aligncenter middle" width="25%">
                                                                 <a href="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/" title="Get bitwarden for Firefox" target="_blank">
                                                                     <img width="57" height="54" alt="Firefox Extension" src="https://bitwarden.com/images/firefox.png" />
                                                                 </a>
                                                             </td>
-                                                            <td valign="middle" class="aligncenter middle" width="33%">
+                                                            <td valign="middle" class="aligncenter middle" width="25%">
                                                                 <a href="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/?utm_source=welcome_email&utm_medium=email" title="Get bitwarden for Opera" target="_blank">
                                                                     <img width="53" height="54" alt="Opera Extension" src="https://bitwarden.com/images/opera.png" />
                                                                 </a>
                                                             </td>
+                                                            <td valign="middle" class="aligncenter middle" width="25%">
+                                                                <a href="https://www.microsoft.com/store/p/bitwarden-free-password-manager/9p6kxl0svnnl" title="Get bitwarden for Edge" target="_blank">
+                                                                    <img width="52" height="54" alt="Edge Extension" src="https://bitwarden.com/images/edge.png" />
+                                                                </a>
+                                                            </td>
                                                         </tr>
                                                     </table>
                                                 </td>
@@ -138,6 +144,7 @@
                                                 <td><a href="https://twitter.com/bitwarden_app" target="_blank"><img src="https://bitwarden.com/images/mail-twitter.png" alt="Twitter" width="30" height="30" /></a></td>
                                                 <td><a href="https://www.facebook.com/bitwarden/" target="_blank"><img src="https://bitwarden.com/images/mail-facebook.png" alt="Facebook" width="30" height="30" /></a></td>
                                                 <td><a href="https://plus.google.com/114869903467947368993" target="_blank"><img src="https://bitwarden.com/images/mail-gplus.png" alt="Google+" width="30" height="30" /></a></td>
+                                                <td><a href="https://github.com/bitwarden" target="_blank"><img src="https://bitwarden.com/images/mail-github.png" alt="GitHub" width="30" height="30" /></a></td>
                                             </tr>
                                         </table>
                                     </td>