diff --git a/Cloud Storage/6.7.0/mail_templates/standardfooter.dcl b/Cloud Storage/6.7.0/mail_templates/standardfooter.dcl
index db372c375..771973923 100644
--- a/Cloud Storage/6.7.0/mail_templates/standardfooter.dcl	
+++ b/Cloud Storage/6.7.0/mail_templates/standardfooter.dcl	
@@ -14,9 +14,6 @@ patch mail_template standardfooter {
                 <!-- Small bottom text -->
                 <td align="center">
                     <table style="padding: 70px 0 90px 0; width: 90%;">
-                        <tr>
-                            <td style="text-align: center">If you don\'t have a KeyShot Account, create one <a style="color: #0066ff;text-decoration: none;" href="https://storage.keyshot.com/">here</a>.</td>
-                        </tr>
                         <tr>
                             <td style="text-align: center">
                                 For any issues, please file a support ticket through our <a style="color: #0066ff" href="https://www.keyshot.com/support">KeyShot Support</a> page.
diff --git a/DC/6.7.0/mail_templates/onetimepassword.dcl b/DC/6.7.0/mail_templates/onetimepassword.dcl
index 755732cfe..d643e731b 100644
--- a/DC/6.7.0/mail_templates/onetimepassword.dcl
+++ b/DC/6.7.0/mail_templates/onetimepassword.dcl
@@ -2,27 +2,43 @@ resource mail_template onetimepassword {
     portal_name = ''
     language_id = resource.language.english.id
     template_name = 'one-time-password'
-    subject = 'One time passwod'
+    subject = 'One-time code'
     system = true
     body = "{{include 'html-header-start'}}
 
-<title>One time password</title>
+<title>One-time code</title>
 
 {{include 'html-header-end'}}
 
-<span class=\"preheader\">One time password requested</span>
+<span class='preheader'>One-time code requested</span>
 
 {{include 'standard-header'}}
+<!-- Action -->
+<table class='body-action' align='center' width='100%' cellpadding='0' cellspacing='0'>
+    <tr>
+        <td align='center' style='font-weight: bold; font-size: 32px; padding-top: 32px; line-height: 1.2;'>Hello!</td>
+    </tr>
+    <tr>
+        <td align='center'>
+            <table
+                style='max-width:600px; width:95%; border-radius:10px; background-color:#ffffff; text-align:center; padding:24px 16px; margin-top:40px'>
+                <tbody>
+                    <tr>
+                        <td style='font-size:18px'>Please enter the code below in your browser</td>
+                    </tr>
+                    <tr>
+                        <td
+                            style='font-weight: 700; font-size: 42px; letter-spacing: 3px; padding-top: 24px; line-height: 1.2;'>{{ data.code }}</td>
+                    </tr>
+                    <tr>
+                        <td style='font-size:18px; padding-top:24px'>This code will expire in <strong>{{ data.expiredIn }} minutes</strong> </td>
+                    </tr>
+                </tbody>
+            </table>
+        </td>
+    </tr>
+</table>
 
-<p>
-    Your one time code:  {{ data.code }}
-</p>
 
 {{include 'standard-footer'}}"
-    autolink = {
-        portal_name = ''
-        language_id = resource.language.english.id
-        template_name = 'one-time-password'
-    }
 }
-