diff --git a/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
index fcf93ea3af..72806a7c5c 100644
--- a/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
+++ b/openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
@@ -4,7 +4,9 @@
 <p>
     {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
     <a
-    {% if course_cta_url %}
+    {% if reset_url %}
+        href={{reset_url}}
+    {% elif course_cta_url %}
         href="{% with_link_tracking course_cta_url %}"
     {% else %}
         {%if course_ids|length > 1 %}
diff --git a/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html b/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
index 5312041d85..f09e38d63f 100644
--- a/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
+++ b/openedx/core/djangoapps/user_authn/templates/user_authn/edx_ace/passwordreset/email/body.html
@@ -37,22 +37,7 @@
                 {% trans "Change my Password" as course_cta_text %}
 
                 {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
-                <a href="{{ reset_link }}" style="
-                    color: #ffffff;
-                    text-decoration: none;
-                    border-radius: 4px;
-                    -webkit-border-radius: 4px;
-                    -moz-border-radius: 4px;
-                    background-color: #005686;
-                    border-top: 12px solid #005686;
-                    border-bottom: 12px solid #005686;
-                    border-right: 50px solid #005686;
-                    border-left: 50px solid #005686;
-                    display: inline-block;
-                ">
-                    {# old email clients require the use of the font tag :( #}
-                    <font color="#ffffff"><b>{{ course_cta_text }}</b></font>
-                </a>
+                {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text reset_url=reset_link %}
             {% endif %}
         </td>
     </tr>
diff --git a/themes/red-theme/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html b/themes/red-theme/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html
index ef4bfa5160..69bc6e3b09 100644
--- a/themes/red-theme/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html
+++ b/themes/red-theme/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html
@@ -4,7 +4,9 @@
 <p>
     {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
     <a
-    {% if course_cta_url %}
+    {% if reset_url %}
+        href={{reset_url}}
+    {% elif course_cta_url %}
         href="{% with_link_tracking course_cta_url %}"
     {% else %}
         {%if course_ids|length > 1 %}