diff --git a/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/base_body.html b/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/base_body.html
new file mode 100644
index 000000000..d82e73d95
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/base_body.html
@@ -0,0 +1,217 @@
+{% raw %}
+
+{% load i18n %}
+{% load ace %}
+
+{% get_current_language as LANGUAGE_CODE %}
+{% get_current_language_bidi as LANGUAGE_BIDI %}
+
+{# This is preview text that is visible in the inbox view of many email clients but not visible in the actual #}
+{# email itself. #}
+
+
+ {% block preview_text %}{% endblock %}
+
+
+{% for image_src in channel.tracker_image_sources %}
+
+{% endfor %}
+
+{% google_analytics_tracking_pixel %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ {% block content %}{% endblock %}
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+{# Debug info that is not user-visible #}
+{{ message.log_id }}
+{{ template_revision }}
+
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/base_head.html b/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/base_head.html
new file mode 100644
index 000000000..ff38110ba
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/base_head.html
@@ -0,0 +1,40 @@
+{% raw %}
+
+{% load i18n %}
+
+
+{% get_current_language as LANGUAGE_CODE %}
+
+ {% block title %}
+ {{ platform_name }}
+ {% endblock %}
+
+
+
+
+
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/return_to_course_cta.html b/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/return_to_course_cta.html
new file mode 100644
index 000000000..cdab5a6e1
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/ace_common/edx_ace/common/return_to_course_cta.html
@@ -0,0 +1,37 @@
+{% raw %}
+
+{% load i18n %}
+{% load ace %}
+
+
+ {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
+ 1 %}
+ href="{% with_link_tracking dashboard_url %}"
+ {% else %}
+ href="{% with_link_tracking course_url %}"
+ {% endif %}
+ {% endif %}
+ style="
+ background: {{ site_configuration_values.COLORS.primary }};
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ color: #fff;
+ display: inline-block;
+ font-size: 15px;
+ font-weight: normal;
+ padding: 10px 20px;
+ text-decoration: none;
+ ">
+ {# old email clients require the use of the font tag :( #}
+
+ {{ course_cta_text }}
+
+
+
+
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/body.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/body.html
new file mode 100644
index 000000000..0521d6fee
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/body.html
@@ -0,0 +1,32 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_body.html' %}
+
+{% load i18n %}
+{% load static %}
+{% block content %}
+
+
+
+
+ {% trans "Invitation to Join " %} {{ platform_name }}
+
+
+ {% blocktrans %}An account has been created for you in {{ platform_name }}. Please use the link below to set your password and log in.{% endblocktrans %}
+
+
+
+ {% if failed %}
+
+ {% trans "If you don't want to join, you can ignore this email." %}
+
+
+ {% else %}
+ {% trans "Set Password" as course_cta_text %}
+
+ {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=reset_link %}
+ {% endif %}
+ |
+
+
+{% endblock %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/body.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/body.txt
new file mode 100644
index 000000000..135ebb713
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/body.txt
@@ -0,0 +1,17 @@
+{% raw %}
+
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}An account has been created for you in {{ platform_name }}. Please use the link below to set your password and log in.{% endblocktrans %}
+
+{% if failed %}
+{% trans "If you don't want to join, you can ignore this email." %}
+{% else %}
+{% trans "Please go to the following page and choose a new password:" %}
+
+{{ reset_link }}
+
+{% trans "Thanks for using our site!" %}
+{% endif %}
+{% blocktrans %}The {{ platform_name }} Team{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
\ No newline at end of file
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/from_name.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/from_name.txt
new file mode 100644
index 000000000..4060dcbd0
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/from_name.txt
@@ -0,0 +1,3 @@
+{% raw %}
+{{ platform_name }}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/head.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/head.html
new file mode 100644
index 000000000..59d834d5a
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/head.html
@@ -0,0 +1,3 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/subject.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/subject.txt
new file mode 100644
index 000000000..c9aecde91
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/passwordset/email/subject.txt
@@ -0,0 +1,6 @@
+{% raw %}
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans trimmed %}Password set on {{ platform_name }}{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/body.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/body.html
new file mode 100644
index 000000000..05e361113
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/body.html
@@ -0,0 +1,23 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_body.html' %}
+
+{% load i18n %}
+{% load static %}
+{% block content %}
+
+
+
+
+ {% blocktrans %}Hi {{ user }},{% endblocktrans %}
+
+
+ {% blocktrans %}Thank you for activating your {{ platform_name }} account. To start exploring, visit: {{ homepage_url }}. Enjoy your learning journey!{% endblocktrans %}
+
+
+ {% blocktrans %}The {{ platform_name }} team.{% endblocktrans %}
+
+ |
+
+
+{% endblock %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/body.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/body.txt
new file mode 100644
index 000000000..13c31f465
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/body.txt
@@ -0,0 +1,8 @@
+{% raw %}
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}Hi {{ user }},{% endblocktrans %}
+{% blocktrans %}Thank you for activating your {{ platform_name }} account. To start exploring, visit: {{ homepage_url }}. Enjoy your learning journey!.{% endblocktrans %}
+
+{% blocktrans %}The {{ platform_name }} team.{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/from_name.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/from_name.txt
new file mode 100644
index 000000000..4060dcbd0
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/from_name.txt
@@ -0,0 +1,3 @@
+{% raw %}
+{{ platform_name }}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/head.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/head.html
new file mode 100644
index 000000000..59d834d5a
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/head.html
@@ -0,0 +1,3 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/subject.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/subject.txt
new file mode 100644
index 000000000..78167173a
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusactivated/email/subject.txt
@@ -0,0 +1,6 @@
+{% raw %}
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans trimmed %}Your account has been activated | {{platform_name}}{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/body.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/body.html
new file mode 100644
index 000000000..e507276e9
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/body.html
@@ -0,0 +1,24 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_body.html' %}
+
+{% load i18n %}
+{% load static %}
+{% block content %}
+
+
+
+
+ {% blocktrans %}Hi {{ user }},{% endblocktrans %}
+
+
+ {% blocktrans %}Your account on {{ platform_name }} has been blocked. If you think this was done in error, please reach out to us at {{ contact_email }}.{% endblocktrans %}
+
+
+ {% trans "Best," %}
+
+ {{ platform_name }}
+ |
+
+
+{% endblock %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/body.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/body.txt
new file mode 100644
index 000000000..63cbac571
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/body.txt
@@ -0,0 +1,8 @@
+{% raw %}
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}Your account on {{ platform_name }} has been blocked. If you think this was done in error, please reach out to us at {{ contact_email }}.{% endblocktrans %}
+
+{% trans "Best," %}
+{% blocktrans %}The {{ platform_name }} Team{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/from_name.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/from_name.txt
new file mode 100644
index 000000000..4060dcbd0
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/from_name.txt
@@ -0,0 +1,3 @@
+{% raw %}
+{{ platform_name }}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/head.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/head.html
new file mode 100644
index 000000000..59d834d5a
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/head.html
@@ -0,0 +1,3 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/subject.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/subject.txt
new file mode 100644
index 000000000..34385b08e
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusblocked/email/subject.txt
@@ -0,0 +1,6 @@
+{% raw %}
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans trimmed %}Your account has been blocked | {{platform_name}}{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/body.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/body.html
new file mode 100644
index 000000000..46a8336b7
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/body.html
@@ -0,0 +1,24 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_body.html' %}
+
+{% load i18n %}
+{% load static %}
+{% block content %}
+
+
+
+
+ {% trans "Hi" %} {{ user }}
+
+
+ {% blocktrans %}Your account on {{ platform_name }} has been deactivated. If you think this was done in error, please reach out to us at {{ contact_email }}.{% endblocktrans %}
+
+
+ {% trans "Best," %}
+
+ {{ platform_name }}
+ |
+
+
+{% endblock %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/body.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/body.txt
new file mode 100644
index 000000000..c0e18b94a
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/body.txt
@@ -0,0 +1,8 @@
+{% raw %}
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}Your account on {{ platform_name }} has been deactivated. If you think this was done in error, please reach out to us at {{ contact_email }}.{% endblocktrans %}
+
+{% trans "Thanks for using our site!" %}
+{% blocktrans %}The {{ platform_name }} Team{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/from_name.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/from_name.txt
new file mode 100644
index 000000000..4060dcbd0
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/from_name.txt
@@ -0,0 +1,3 @@
+{% raw %}
+{{ platform_name }}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/head.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/head.html
new file mode 100644
index 000000000..59d834d5a
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/head.html
@@ -0,0 +1,3 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/subject.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/subject.txt
new file mode 100644
index 000000000..4134fe66e
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusdeactivated/email/subject.txt
@@ -0,0 +1,6 @@
+{% raw %}
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans trimmed %}Your account has been deactivated | {{platform_name}}{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/body.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/body.html
new file mode 100644
index 000000000..5e87091c8
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/body.html
@@ -0,0 +1,24 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_body.html' %}
+
+{% load i18n %}
+{% load static %}
+{% block content %}
+
+
+
+
+ {% blocktrans %}Hi {{ user }},{% endblocktrans %}
+
+
+ {% blocktrans %}Your account has been unblocked. Please reset your password to continue your learning. To reset password, visit: {{ password_reset_url }}{% endblocktrans %}
+
+
+ {% trans "Best," %}
+
+ {{ platform_name }}
+ |
+
+
+{% endblock %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/body.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/body.txt
new file mode 100644
index 000000000..2ab196fcf
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/body.txt
@@ -0,0 +1,8 @@
+{% raw %}
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}Your account has been unblocked. Please reset your password to continue your learning. To reset password, visit: {{ password_reset_url }}{% endblocktrans %}
+
+{% trans "Best," %}
+{% blocktrans %}The {{ platform_name }} Team{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/from_name.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/from_name.txt
new file mode 100644
index 000000000..4060dcbd0
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/from_name.txt
@@ -0,0 +1,3 @@
+{% raw %}
+{{ platform_name }}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/head.html b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/head.html
new file mode 100644
index 000000000..59d834d5a
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/head.html
@@ -0,0 +1,3 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_head.html' %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/subject.txt b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/subject.txt
new file mode 100644
index 000000000..8861dafd5
--- /dev/null
+++ b/tutorindigo/templates/indigo/cms/templates/edly_panel_app/edx_ace/userstatusunblocked/email/subject.txt
@@ -0,0 +1,6 @@
+{% raw %}
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans trimmed %}Your account has been unblocked | {{platform_name}}{% endblocktrans %}
+{% endautoescape %}
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/base_body.html b/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/base_body.html
new file mode 100644
index 000000000..d82e73d95
--- /dev/null
+++ b/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/base_body.html
@@ -0,0 +1,217 @@
+{% raw %}
+
+{% load i18n %}
+{% load ace %}
+
+{% get_current_language as LANGUAGE_CODE %}
+{% get_current_language_bidi as LANGUAGE_BIDI %}
+
+{# This is preview text that is visible in the inbox view of many email clients but not visible in the actual #}
+{# email itself. #}
+
+
+ {% block preview_text %}{% endblock %}
+
+
+{% for image_src in channel.tracker_image_sources %}
+
+{% endfor %}
+
+{% google_analytics_tracking_pixel %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ {% block content %}{% endblock %}
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+{# Debug info that is not user-visible #}
+{{ message.log_id }}
+{{ template_revision }}
+
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/base_head.html b/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/base_head.html
new file mode 100644
index 000000000..ff38110ba
--- /dev/null
+++ b/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/base_head.html
@@ -0,0 +1,40 @@
+{% raw %}
+
+{% load i18n %}
+
+
+{% get_current_language as LANGUAGE_CODE %}
+
+ {% block title %}
+ {{ platform_name }}
+ {% endblock %}
+
+
+
+
+
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html b/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html
new file mode 100644
index 000000000..cdab5a6e1
--- /dev/null
+++ b/tutorindigo/templates/indigo/lms/templates/ace_common/edx_ace/common/return_to_course_cta.html
@@ -0,0 +1,37 @@
+{% raw %}
+
+{% load i18n %}
+{% load ace %}
+
+
+ {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
+ 1 %}
+ href="{% with_link_tracking dashboard_url %}"
+ {% else %}
+ href="{% with_link_tracking course_url %}"
+ {% endif %}
+ {% endif %}
+ style="
+ background: {{ site_configuration_values.COLORS.primary }};
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ color: #fff;
+ display: inline-block;
+ font-size: 15px;
+ font-weight: normal;
+ padding: 10px 20px;
+ text-decoration: none;
+ ">
+ {# old email clients require the use of the font tag :( #}
+
+ {{ course_cta_text }}
+
+
+
+
+{% endraw %}
diff --git a/tutorindigo/templates/indigo/lms/templates/user_authn/edx_ace/passwordreset/email/body.html b/tutorindigo/templates/indigo/lms/templates/user_authn/edx_ace/passwordreset/email/body.html
new file mode 100644
index 000000000..ff7ec09bf
--- /dev/null
+++ b/tutorindigo/templates/indigo/lms/templates/user_authn/edx_ace/passwordreset/email/body.html
@@ -0,0 +1,43 @@
+{% raw %}
+{% extends 'ace_common/edx_ace/common/base_body.html' %}
+
+{% load i18n %}
+{% load static %}
+{% block content %}
+
+
+
+
+ {% trans "Password Reset" %}
+
+
+ {% blocktrans %}You are receiving this e-mail because you requested a password reset for your user account at {{ platform_name }}.{% endblocktrans %}
+
+
+
+ {% if failed %}
+
+ {% blocktrans %}However, there is currently no user account associated with your email address: {{ email_address }}.{% endblocktrans %}
+
+
+
+
+ {% trans "If you did not request this change, you can ignore this email." %}
+
+
+ {% else %}
+
+ {% trans "If you did not request this change, you can disregard this email - we have not yet reset your password." %}
+
+
+
+ {% trans "Change my Password" as course_cta_text %}
+
+ {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=reset_link %}
+ {% endif %}
+ |
+
+
+{% endblock %}
+
+{% endraw %}