diff --git a/DC/6.7.0/mail_templates/onetimepassword.dcl b/DC/6.7.0/mail_templates/onetimepassword.dcl
index 755732cfe..8be7fee63 100644
--- a/DC/6.7.0/mail_templates/onetimepassword.dcl
+++ b/DC/6.7.0/mail_templates/onetimepassword.dcl
@@ -14,11 +14,15 @@ resource mail_template onetimepassword {
 
 {{include 'standard-header'}}
 
-<p>
-    Your one time code:  {{ data.code }}
-</p>
 
-{{include 'standard-footer'}}"
+<div align=\"center", style="background: #fff; border-radius: 10px; width: 80%; padding: 10px; margin: 0 auto;\">
+    <h2>Hello!</h2>
+    <div>To activate, please enter the code below in your browser</div>
+    <div><h1>{{ data.code }}</h1><div>
+    <div>This code will expire in <b>{{ data.expiredIn }}</b> minutes</div>
+</div>
+
+{{include 'terms-conditions-footer'}}"
     autolink = {
         portal_name = ''
         language_id = resource.language.english.id
diff --git a/DC/6.7.0/mail_templates/termsconditionsfooter.dcl b/DC/6.7.0/mail_templates/termsconditionsfooter.dcl
new file mode 100644
index 000000000..8ba29eb88
--- /dev/null
+++ b/DC/6.7.0/mail_templates/termsconditionsfooter.dcl
@@ -0,0 +1,100 @@
+resource mail_template terms_conditions_footer {
+    portal_name = ''
+    language_id = resource.language.english.id
+    template_name = 'terms-conditions-footer'
+    subject = 'terms-conditions-footer'
+    system = true
+    body = '
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+                <!-- Small bottom text -->
+                <td align="center">
+                    <table style="padding: 70px 0 90px 0; width: 90%;">
+                        <tr>
+                            <td style="text-align: center">By registering you agree to <a style="color: #0066ff;text-decoration: none;" href="https://www.keyshot.com/legal/keyshot-studio-terms-of-use/">Terms &amp; conditions of Use</a>.</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align: center">
+                                For activation issues, please file a support ticket through our <a style="color: #0066ff" href="https://www.keyshot.com/support">KeyShot Support</a> page.
+                            </td>
+                        </tr>
+                    </table>
+                    <table style="width:100%;">
+                        <tr>
+                            <td>
+                                <p class="meta" style="text-align: center;padding: 0 100px;font: normal normal normal 11px/15px Verdana;">KeyShot, 575 Anton Blvd Suite 650, Costa Mesa, CA, 92626, USA, (949) 274-8871 </p>
+                                <p class="meta" style="text-align: center;padding: 0 100px;font: normal normal normal 11px/15px Verdana;"><a href="mailto:info@keyshot.com" style="color: #666;text-decoration: none;">info@keyshot.com</a> | <a href="https://www.keyshot.com" style="color: #666;text-decoration: none;">keyshot.com</a></p>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+    <tr align="center" style="width: 100%; background: #151515; color: #ffffff">
+        <!-- Footer -->
+        <td style="padding: 120px 0">
+            <table>
+                <tr>
+                    <td style="width: 20%">
+                        <a href="https://www.youtube.com/c/keyshot" target="_blank" rel="noreferrer noopener" aria-title="KeyShot\'s YouTube channel" style="display: block; margin: 8px;"><img src="https://email.keyshot.com/hubfs/email/youtube.png" alt="YouTube" width="40" height="40" style="color: #ffffff; font-size: 16px" /></a>
+                    </td>
+                    <td style="width: 20%">
+                        <a href="https://www.facebook.com/LuxionKeyShot" target="_blank" rel="noreferrer noopener" aria-title="KeyShot\'s Facebook page" style="display: block;  margin: 8px;"><img src="https://email.keyshot.com/hubfs/email/facebook.png" alt="Facebook" width="40" height="40" style="color: #ffffff; font-size: 16px" /></a>
+                    </td>
+                    <td style="width: 20%">
+                        <a href="https://twitter.com/KeyShot3D" target="_blank" rel="noreferrer noopener" aria-title="KeyShot\'s Twitter account" style="display: block;  margin: 8px;"><img src="https://email.keyshot.com/hubfs/email/twitter.png" alt="Twitter" width="40" height="40" style="color: #ffffff; font-size: 16px" /></a>
+                    </td>
+                    <td style="width: 20%">
+                        <a href="https://www.instagram.com/keyshot3d" target="_blank" rel="noreferrer noopener" aria-title="KeyShot\'s Instagram profile" style="display: block;  margin: 8px;"><img src="https://email.keyshot.com/hubfs/email/instagram.png" alt="Instagram" width="40" height="40" style="color: #ffffff; font-size: 16px" /></a>
+                    </td>
+                    <td style="width: 20%">
+                        <a href="https://www.pinterest.dk/keyshot" target="_blank" rel="noreferrer noopener" aria-title="KeyShot\'s Pinterest profile" style="display: block;  margin: 8px;"><img src="https://email.keyshot.com/hubfs/email/pinterest.png" alt="Pinterest" width="40" height="40" style="color: #ffffff; font-size: 16px" /></a>
+                    </td>
+                </tr>
+            </table>
+
+            <table>
+                <tr>
+                    <td>
+                        <a style="
+                                                      display: block;
+                                                      color: #848f98;
+                                                      padding: 8px;
+                                                      margin: 8px;
+                                                      text-decoration: none;
+                                                      font-weight: 700;
+                                                    " href="https://www.keyshot.com/support">Support</a>
+                    </td>
+                    <td style="color: #ffffff;">•</td>
+                    <td>
+                        <a style="
+                                                      display: block;
+                                                      color: #848f98;
+                                                      padding: 8px;
+                                                      margin: 8px;
+                                                      text-decoration: none;
+                                                      font-weight: 700;
+                                                    " href="https://account.keyshot.com">Go to account</a>
+                    </td>
+                </tr>
+
+            </table>
+        </td>
+    </tr>
+</table>
+</td>
+</tr>
+</table>
+</body>
+</html>
+'
+    autolink = {
+        portal_name = ''
+        language_id = resource.language.english.id
+        template_name = 'terms-conditions-footer'
+    }
+}
+