diff --git a/server/Resources/email.html b/server/Resources/email.html
index 6123154..a63a5f3 100644
--- a/server/Resources/email.html
+++ b/server/Resources/email.html
@@ -6,14 +6,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <title>Forgot password</title>
   <style>
-    /* -------------------------------------
-        INLINED WITH htmlemail.io/inline
-    ------------------------------------- */
-
-    /* -------------------------------------
-        RESPONSIVE AND MOBILE FRIENDLY STYLES
-    ------------------------------------- */
-
     @media only screen and (max-width: 620px) {
       table[class=body] h1 {
         font-size: 28px !important;
@@ -56,10 +48,6 @@
       }
     }
 
-    /* -------------------------------------
-        PRESERVE THESE STYLES IN THE HEAD
-    ------------------------------------- */
-
     @media all {
       .ExternalClass {
         width: 100%;
@@ -97,12 +85,7 @@
       <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;">&nbsp;</td>
       <td class="container" style="font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 580px; padding: 10px; width: 580px;">
         <div class="content" style="box-sizing: border-box; display: block; Margin: 0 auto; max-width: 580px; padding: 10px;">
-
-          <!-- START CENTERED WHITE CONTAINER -->
-          <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">This is preheader text. Some clients will show this text as a preview.</span>
           <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 3px;">
-
-            <!-- START MAIN CONTENT AREA -->
             <tr>
               <td class="wrapper" style="font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;">
                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
@@ -119,8 +102,6 @@
           </td>
           </tr>
   </table>
-
-  <!-- START FOOTER -->
   <div class="footer" style="clear: both; Margin-top: 10px; text-align: center; width: 100%;">
     <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
       <tr>
diff --git a/server/Resources/forgot_password.html b/server/Resources/forgot_password.html
index 983dd6e..e2efd7a 100644
--- a/server/Resources/forgot_password.html
+++ b/server/Resources/forgot_password.html
@@ -6,14 +6,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <title>Forgot password</title>
   <style>
-    /* -------------------------------------
-        INLINED WITH htmlemail.io/inline
-    ------------------------------------- */
-
-    /* -------------------------------------
-        RESPONSIVE AND MOBILE FRIENDLY STYLES
-    ------------------------------------- */
-
     @media only screen and (max-width: 620px) {
       table[class=body] h1 {
         font-size: 28px !important;
@@ -56,10 +48,6 @@
       }
     }
 
-    /* -------------------------------------
-        PRESERVE THESE STYLES IN THE HEAD
-    ------------------------------------- */
-
     @media all {
       .ExternalClass {
         width: 100%;
@@ -98,11 +86,7 @@
       <td class="container" style="font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 580px; padding: 10px; width: 580px;">
         <div class="content" style="box-sizing: border-box; display: block; Margin: 0 auto; max-width: 580px; padding: 10px;">
 
-          <!-- START CENTERED WHITE CONTAINER -->
-          <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">This is preheader text. Some clients will show this text as a preview.</span>
           <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 3px;">
-
-            <!-- START MAIN CONTENT AREA -->
             <tr>
               <td class="wrapper" style="font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;">
                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
@@ -120,7 +104,7 @@
                                 <tbody>
                                   <tr>
                                     <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #3498db; border-radius: 5px; text-align: center;">
-                                    <a href="{{resetLink}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #3498db; border: solid 1px #3498db; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #3498db;">Reset my password</a>
+                                      <a href="{{resetLink}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #3498db; border: solid 1px #3498db; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #3498db;">Click here to reset</a>
                                     </td>
                                   </tr>
                                 </tbody>
@@ -135,8 +119,6 @@
               </td>
             </tr>
           </table>
-
-          <!-- START FOOTER -->
           <div class="footer" style="clear: both; Margin-top: 10px; text-align: center; width: 100%;">
             <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
               <tr>