From eb6ae510ae1b9ba0c9ce6dd7f63aaf2037e241a3 Mon Sep 17 00:00:00 2001
From: geek <geek@loafle.com>
Date: Mon, 11 Jun 2018 12:12:37 +0900
Subject: [PATCH] email token duplication check

---
 .../development/vmtemplates/password_reset.vm | 126 +++++++++---------
 .../development/vmtemplates/signup.vm         | 126 +++++++++---------
 .../local/vmtemplates/password_reset.vm       | 126 +++++++++---------
 .../resources/local/vmtemplates/signup.vm     | 126 +++++++++---------
 .../production/vmtemplates/password_reset.vm  | 126 +++++++++---------
 .../production/vmtemplates/signup.vm          | 126 +++++++++---------
 .../staging/vmtemplates/password_reset.vm     | 126 +++++++++---------
 .../resources/staging/vmtemplates/signup.vm   | 126 +++++++++---------
 8 files changed, 504 insertions(+), 504 deletions(-)

diff --git a/src/main/resources/development/vmtemplates/password_reset.vm b/src/main/resources/development/vmtemplates/password_reset.vm
index 1792fc3..3956c3f 100644
--- a/src/main/resources/development/vmtemplates/password_reset.vm
+++ b/src/main/resources/development/vmtemplates/password_reset.vm
@@ -1,72 +1,72 @@
 <xmeta charset="utf-8">
-    <xmeta name="viewport" content="width=device-width, initial-scale=1">
-        <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
+  <xmeta name="viewport" content="width=device-width, initial-scale=1">
+    <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tbody>
-                <tr>
-                    <td align="center" style="padding: 10px">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
-                            <tbody>
-                            <tr>
-                                <td>
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                        <tbody>
-                                        <tr>
-                                            <td style="padding: 20px;text-align:center; background: #203976;">
-                                                <img src="cid:company-logo" width="206" height="36" alt=""/></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
-                                                Resset Your Password
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td align="center" style="padding: 10px">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
+              <tbody>
+              <tr>
+                <td>
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                    <tr>
+                      <td style="padding: 20px;text-align:center; background: #203976;">
+                        <img src="cid:company-logo" width="206" height="36" alt=""/></td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
+                        Resset Your Password
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
 
-                                                <p>Dear ${firstName} ${lastName},</p>
+                        <p>Dear ${firstName} ${lastName},</p>
 
-                                                <p>Sending Email <b>${content}</b></p>
+                        <p>Sending Email <b>${content}</b></p>
 
-                                                <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
-                                                    <tbody>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    <tr>
-                                                        <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
-                                                            <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">RESSET PASSWORD NOW</a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    </tbody>
-                                                </table>
-
-                                                <p>Thanks</p>
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
-                                                <p>${signature}</p>
-
-                                                <p>${location}</p>
-
-                                                <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
-                                                <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
-                                                <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            </tbody>
+                        <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          <tr>
+                            <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
+                              <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">RESSET PASSWORD NOW</a>
+                            </td>
+                          </tr>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          </tbody>
                         </table>
-                    </td>
-                </tr>
-                </tbody>
+
+                        <p>Thanks</p>
+
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
+                        <p>${signature}</p>
+
+                        <p>${location}</p>
+
+                        <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
+                        <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
+                        <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+              </tbody>
             </table>
-        </xmeta>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </xmeta>
+  </xmeta>
 </xmeta>
diff --git a/src/main/resources/development/vmtemplates/signup.vm b/src/main/resources/development/vmtemplates/signup.vm
index 573d1cc..837ba98 100644
--- a/src/main/resources/development/vmtemplates/signup.vm
+++ b/src/main/resources/development/vmtemplates/signup.vm
@@ -1,72 +1,72 @@
 <xmeta charset="utf-8">
-    <xmeta name="viewport" content="width=device-width, initial-scale=1">
-        <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
+  <xmeta name="viewport" content="width=device-width, initial-scale=1">
+    <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tbody>
-                <tr>
-                    <td align="center" style="padding: 10px">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
-                            <tbody>
-                            <tr>
-                                <td>
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                        <tbody>
-                                        <tr>
-                                            <td style="padding: 20px;text-align:center; background: #203976;">
-                                                <img src="cid:company-logo" width="206" height="36" alt=""/></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
-                                                Welcome to overFlow. Please Confirm your Email
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td align="center" style="padding: 10px">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
+              <tbody>
+              <tr>
+                <td>
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                    <tr>
+                      <td style="padding: 20px;text-align:center; background: #203976;">
+                        <img src="cid:company-logo" width="206" height="36" alt=""/></td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
+                        Welcome to overFlow. Please Confirm your Email
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
 
-                                                <p>Dear ${firstName} ${lastName},</p>
+                        <p>Dear ${firstName} ${lastName},</p>
 
-                                                <p>Sending Email <b>${content}</b></p>
+                        <p>Sending Email <b>${content}</b></p>
 
-                                                <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
-                                                    <tbody>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    <tr>
-                                                        <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
-                                                            <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">Register Now</a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    </tbody>
-                                                </table>
-
-                                                <p>Thanks</p>
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
-                                                <p>${signature}</p>
-
-                                                <p>${location}</p>
-
-                                                <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
-                                                <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
-                                                <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            </tbody>
+                        <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          <tr>
+                            <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
+                              <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">Register Now</a>
+                            </td>
+                          </tr>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          </tbody>
                         </table>
-                    </td>
-                </tr>
-                </tbody>
+
+                        <p>Thanks</p>
+
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
+                        <p>${signature}</p>
+
+                        <p>${location}</p>
+
+                        <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
+                        <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
+                        <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+              </tbody>
             </table>
-        </xmeta>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </xmeta>
+  </xmeta>
 </xmeta>
diff --git a/src/main/resources/local/vmtemplates/password_reset.vm b/src/main/resources/local/vmtemplates/password_reset.vm
index 1792fc3..3956c3f 100644
--- a/src/main/resources/local/vmtemplates/password_reset.vm
+++ b/src/main/resources/local/vmtemplates/password_reset.vm
@@ -1,72 +1,72 @@
 <xmeta charset="utf-8">
-    <xmeta name="viewport" content="width=device-width, initial-scale=1">
-        <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
+  <xmeta name="viewport" content="width=device-width, initial-scale=1">
+    <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tbody>
-                <tr>
-                    <td align="center" style="padding: 10px">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
-                            <tbody>
-                            <tr>
-                                <td>
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                        <tbody>
-                                        <tr>
-                                            <td style="padding: 20px;text-align:center; background: #203976;">
-                                                <img src="cid:company-logo" width="206" height="36" alt=""/></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
-                                                Resset Your Password
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td align="center" style="padding: 10px">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
+              <tbody>
+              <tr>
+                <td>
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                    <tr>
+                      <td style="padding: 20px;text-align:center; background: #203976;">
+                        <img src="cid:company-logo" width="206" height="36" alt=""/></td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
+                        Resset Your Password
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
 
-                                                <p>Dear ${firstName} ${lastName},</p>
+                        <p>Dear ${firstName} ${lastName},</p>
 
-                                                <p>Sending Email <b>${content}</b></p>
+                        <p>Sending Email <b>${content}</b></p>
 
-                                                <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
-                                                    <tbody>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    <tr>
-                                                        <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
-                                                            <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">RESSET PASSWORD NOW</a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    </tbody>
-                                                </table>
-
-                                                <p>Thanks</p>
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
-                                                <p>${signature}</p>
-
-                                                <p>${location}</p>
-
-                                                <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
-                                                <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
-                                                <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            </tbody>
+                        <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          <tr>
+                            <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
+                              <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">RESSET PASSWORD NOW</a>
+                            </td>
+                          </tr>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          </tbody>
                         </table>
-                    </td>
-                </tr>
-                </tbody>
+
+                        <p>Thanks</p>
+
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
+                        <p>${signature}</p>
+
+                        <p>${location}</p>
+
+                        <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
+                        <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
+                        <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+              </tbody>
             </table>
-        </xmeta>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </xmeta>
+  </xmeta>
 </xmeta>
diff --git a/src/main/resources/local/vmtemplates/signup.vm b/src/main/resources/local/vmtemplates/signup.vm
index 573d1cc..837ba98 100644
--- a/src/main/resources/local/vmtemplates/signup.vm
+++ b/src/main/resources/local/vmtemplates/signup.vm
@@ -1,72 +1,72 @@
 <xmeta charset="utf-8">
-    <xmeta name="viewport" content="width=device-width, initial-scale=1">
-        <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
+  <xmeta name="viewport" content="width=device-width, initial-scale=1">
+    <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tbody>
-                <tr>
-                    <td align="center" style="padding: 10px">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
-                            <tbody>
-                            <tr>
-                                <td>
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                        <tbody>
-                                        <tr>
-                                            <td style="padding: 20px;text-align:center; background: #203976;">
-                                                <img src="cid:company-logo" width="206" height="36" alt=""/></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
-                                                Welcome to overFlow. Please Confirm your Email
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td align="center" style="padding: 10px">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
+              <tbody>
+              <tr>
+                <td>
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                    <tr>
+                      <td style="padding: 20px;text-align:center; background: #203976;">
+                        <img src="cid:company-logo" width="206" height="36" alt=""/></td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
+                        Welcome to overFlow. Please Confirm your Email
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
 
-                                                <p>Dear ${firstName} ${lastName},</p>
+                        <p>Dear ${firstName} ${lastName},</p>
 
-                                                <p>Sending Email <b>${content}</b></p>
+                        <p>Sending Email <b>${content}</b></p>
 
-                                                <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
-                                                    <tbody>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    <tr>
-                                                        <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
-                                                            <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">Register Now</a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    </tbody>
-                                                </table>
-
-                                                <p>Thanks</p>
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
-                                                <p>${signature}</p>
-
-                                                <p>${location}</p>
-
-                                                <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
-                                                <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
-                                                <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            </tbody>
+                        <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          <tr>
+                            <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
+                              <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">Register Now</a>
+                            </td>
+                          </tr>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          </tbody>
                         </table>
-                    </td>
-                </tr>
-                </tbody>
+
+                        <p>Thanks</p>
+
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
+                        <p>${signature}</p>
+
+                        <p>${location}</p>
+
+                        <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
+                        <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
+                        <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+              </tbody>
             </table>
-        </xmeta>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </xmeta>
+  </xmeta>
 </xmeta>
diff --git a/src/main/resources/production/vmtemplates/password_reset.vm b/src/main/resources/production/vmtemplates/password_reset.vm
index 1792fc3..3956c3f 100644
--- a/src/main/resources/production/vmtemplates/password_reset.vm
+++ b/src/main/resources/production/vmtemplates/password_reset.vm
@@ -1,72 +1,72 @@
 <xmeta charset="utf-8">
-    <xmeta name="viewport" content="width=device-width, initial-scale=1">
-        <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
+  <xmeta name="viewport" content="width=device-width, initial-scale=1">
+    <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tbody>
-                <tr>
-                    <td align="center" style="padding: 10px">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
-                            <tbody>
-                            <tr>
-                                <td>
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                        <tbody>
-                                        <tr>
-                                            <td style="padding: 20px;text-align:center; background: #203976;">
-                                                <img src="cid:company-logo" width="206" height="36" alt=""/></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
-                                                Resset Your Password
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td align="center" style="padding: 10px">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
+              <tbody>
+              <tr>
+                <td>
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                    <tr>
+                      <td style="padding: 20px;text-align:center; background: #203976;">
+                        <img src="cid:company-logo" width="206" height="36" alt=""/></td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
+                        Resset Your Password
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
 
-                                                <p>Dear ${firstName} ${lastName},</p>
+                        <p>Dear ${firstName} ${lastName},</p>
 
-                                                <p>Sending Email <b>${content}</b></p>
+                        <p>Sending Email <b>${content}</b></p>
 
-                                                <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
-                                                    <tbody>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    <tr>
-                                                        <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
-                                                            <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">RESSET PASSWORD NOW</a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    </tbody>
-                                                </table>
-
-                                                <p>Thanks</p>
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
-                                                <p>${signature}</p>
-
-                                                <p>${location}</p>
-
-                                                <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
-                                                <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
-                                                <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            </tbody>
+                        <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          <tr>
+                            <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
+                              <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">RESSET PASSWORD NOW</a>
+                            </td>
+                          </tr>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          </tbody>
                         </table>
-                    </td>
-                </tr>
-                </tbody>
+
+                        <p>Thanks</p>
+
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
+                        <p>${signature}</p>
+
+                        <p>${location}</p>
+
+                        <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
+                        <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
+                        <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+              </tbody>
             </table>
-        </xmeta>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </xmeta>
+  </xmeta>
 </xmeta>
diff --git a/src/main/resources/production/vmtemplates/signup.vm b/src/main/resources/production/vmtemplates/signup.vm
index 573d1cc..837ba98 100644
--- a/src/main/resources/production/vmtemplates/signup.vm
+++ b/src/main/resources/production/vmtemplates/signup.vm
@@ -1,72 +1,72 @@
 <xmeta charset="utf-8">
-    <xmeta name="viewport" content="width=device-width, initial-scale=1">
-        <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
+  <xmeta name="viewport" content="width=device-width, initial-scale=1">
+    <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tbody>
-                <tr>
-                    <td align="center" style="padding: 10px">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
-                            <tbody>
-                            <tr>
-                                <td>
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                        <tbody>
-                                        <tr>
-                                            <td style="padding: 20px;text-align:center; background: #203976;">
-                                                <img src="cid:company-logo" width="206" height="36" alt=""/></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
-                                                Welcome to overFlow. Please Confirm your Email
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td align="center" style="padding: 10px">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
+              <tbody>
+              <tr>
+                <td>
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                    <tr>
+                      <td style="padding: 20px;text-align:center; background: #203976;">
+                        <img src="cid:company-logo" width="206" height="36" alt=""/></td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
+                        Welcome to overFlow. Please Confirm your Email
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
 
-                                                <p>Dear ${firstName} ${lastName},</p>
+                        <p>Dear ${firstName} ${lastName},</p>
 
-                                                <p>Sending Email <b>${content}</b></p>
+                        <p>Sending Email <b>${content}</b></p>
 
-                                                <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
-                                                    <tbody>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    <tr>
-                                                        <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
-                                                            <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">Register Now</a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    </tbody>
-                                                </table>
-
-                                                <p>Thanks</p>
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
-                                                <p>${signature}</p>
-
-                                                <p>${location}</p>
-
-                                                <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
-                                                <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
-                                                <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            </tbody>
+                        <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          <tr>
+                            <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
+                              <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">Register Now</a>
+                            </td>
+                          </tr>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          </tbody>
                         </table>
-                    </td>
-                </tr>
-                </tbody>
+
+                        <p>Thanks</p>
+
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
+                        <p>${signature}</p>
+
+                        <p>${location}</p>
+
+                        <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
+                        <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
+                        <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+              </tbody>
             </table>
-        </xmeta>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </xmeta>
+  </xmeta>
 </xmeta>
diff --git a/src/main/resources/staging/vmtemplates/password_reset.vm b/src/main/resources/staging/vmtemplates/password_reset.vm
index 1792fc3..3956c3f 100644
--- a/src/main/resources/staging/vmtemplates/password_reset.vm
+++ b/src/main/resources/staging/vmtemplates/password_reset.vm
@@ -1,72 +1,72 @@
 <xmeta charset="utf-8">
-    <xmeta name="viewport" content="width=device-width, initial-scale=1">
-        <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
+  <xmeta name="viewport" content="width=device-width, initial-scale=1">
+    <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tbody>
-                <tr>
-                    <td align="center" style="padding: 10px">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
-                            <tbody>
-                            <tr>
-                                <td>
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                        <tbody>
-                                        <tr>
-                                            <td style="padding: 20px;text-align:center; background: #203976;">
-                                                <img src="cid:company-logo" width="206" height="36" alt=""/></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
-                                                Resset Your Password
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td align="center" style="padding: 10px">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
+              <tbody>
+              <tr>
+                <td>
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                    <tr>
+                      <td style="padding: 20px;text-align:center; background: #203976;">
+                        <img src="cid:company-logo" width="206" height="36" alt=""/></td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
+                        Resset Your Password
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
 
-                                                <p>Dear ${firstName} ${lastName},</p>
+                        <p>Dear ${firstName} ${lastName},</p>
 
-                                                <p>Sending Email <b>${content}</b></p>
+                        <p>Sending Email <b>${content}</b></p>
 
-                                                <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
-                                                    <tbody>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    <tr>
-                                                        <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
-                                                            <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">RESSET PASSWORD NOW</a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    </tbody>
-                                                </table>
-
-                                                <p>Thanks</p>
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
-                                                <p>${signature}</p>
-
-                                                <p>${location}</p>
-
-                                                <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
-                                                <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
-                                                <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            </tbody>
+                        <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          <tr>
+                            <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
+                              <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">RESSET PASSWORD NOW</a>
+                            </td>
+                          </tr>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          </tbody>
                         </table>
-                    </td>
-                </tr>
-                </tbody>
+
+                        <p>Thanks</p>
+
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
+                        <p>${signature}</p>
+
+                        <p>${location}</p>
+
+                        <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
+                        <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
+                        <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+              </tbody>
             </table>
-        </xmeta>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </xmeta>
+  </xmeta>
 </xmeta>
diff --git a/src/main/resources/staging/vmtemplates/signup.vm b/src/main/resources/staging/vmtemplates/signup.vm
index 573d1cc..837ba98 100644
--- a/src/main/resources/staging/vmtemplates/signup.vm
+++ b/src/main/resources/staging/vmtemplates/signup.vm
@@ -1,72 +1,72 @@
 <xmeta charset="utf-8">
-    <xmeta name="viewport" content="width=device-width, initial-scale=1">
-        <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
+  <xmeta name="viewport" content="width=device-width, initial-scale=1">
+    <xmeta http-equiv="X-UA-Compatible" content="IE=edge">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tbody>
-                <tr>
-                    <td align="center" style="padding: 10px">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
-                            <tbody>
-                            <tr>
-                                <td>
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                                        <tbody>
-                                        <tr>
-                                            <td style="padding: 20px;text-align:center; background: #203976;">
-                                                <img src="cid:company-logo" width="206" height="36" alt=""/></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
-                                                Welcome to overFlow. Please Confirm your Email
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td align="center" style="padding: 10px">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:5px solid #d5d8dc;max-width: 600px;">
+              <tbody>
+              <tr>
+                <td>
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                    <tr>
+                      <td style="padding: 20px;text-align:center; background: #203976;">
+                        <img src="cid:company-logo" width="206" height="36" alt=""/></td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 40px 20px 0px 20px;font-family: Arial, Helvetica, Sans-serif;color: #383838;font-size: 1.3em; font-weight: bold;">
+                        Welcome to overFlow. Please Confirm your Email
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px 20px;font-family: Arial, Helvetica, Sans-serif; color: #383838;">
 
-                                                <p>Dear ${firstName} ${lastName},</p>
+                        <p>Dear ${firstName} ${lastName},</p>
 
-                                                <p>Sending Email <b>${content}</b></p>
+                        <p>Sending Email <b>${content}</b></p>
 
-                                                <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
-                                                    <tbody>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    <tr>
-                                                        <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
-                                                            <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">Register Now</a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
-                                                    </tbody>
-                                                </table>
-
-                                                <p>Thanks</p>
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
-                                                <p>${signature}</p>
-
-                                                <p>${location}</p>
-
-                                                <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
-                                                <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
-                                                    <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
-                                                <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                            </tbody>
+                        <table style="border-collapse: collapse; margin: 0 auto; color: #ffffff;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          <tr>
+                            <td align="center" valign="middle" style="text-align: center; text-decoration: none!important; text-transform: uppercase; font-weight: 400; font-size: 16px; font-family: Arial, Helvetica, Sans-serif; color: #ffffff; background-color: #2185d0; background-clip: border-box; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; padding: 10px 30px 10px 30px;" width="100%">
+                              <a href="${content}" target="_blank" style="color: #ffffff; text-decoration: none;" rel="noreferrer noopener">Register Now</a>
+                            </td>
+                          </tr>
+                          <tr><td style="border: 0; padding: 0; margin: 0; mso-line-height-rule: exactly;" height="15"></td></tr>
+                          </tbody>
                         </table>
-                    </td>
-                </tr>
-                </tbody>
+
+                        <p>Thanks</p>
+
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="padding: 30px;font-family: Arial, Helvetica, Sans-serif;font-size: 0.8em; text-align:center;color:#eeeeee; background: #686868">
+                        <p>${signature}</p>
+
+                        <p>${location}</p>
+
+                        <p>Copyright ⓒ 2017 LOAFLE. All Rights Reserved.</p>
+                        <p><a href="" target="_blank" style="color:#eeeeee;">Help Center</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Privacy Policy</a>   ·
+                          <a href="" target="_blank" style="color:#eeeeee;">Terms & Conditions</a></p>
+                        <p><a href="" style="color:#eeeeee;">Unsubscribe from this email</a></p>
+                      </td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+              </tbody>
             </table>
-        </xmeta>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </xmeta>
+  </xmeta>
 </xmeta>