diff --git a/app/email_utils.py b/app/email_utils.py
index c3db0be1..61331fc8 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -114,7 +114,7 @@ def send_trial_end_soon_email(user):
     send_email(
         user.email,
         f"Your trial will end soon",
-        render("transactional/trial-end.txt", user=user),
+        render("transactional/trial-end.txt.jinja2", user=user),
         render("transactional/trial-end.html", user=user),
     )
 
diff --git a/templates/dashboard/domain_detail/base.html b/templates/dashboard/domain_detail/base.html
index c6126063..9aa53519 100644
--- a/templates/dashboard/domain_detail/base.html
+++ b/templates/dashboard/domain_detail/base.html
@@ -1,6 +1,10 @@
 {% extends 'default.html' %}
 
-{% set active_page = "custom_domain" %}
+{% if custom_domain.is_sl_subdomain %}
+  {% set active_page = "subdomain" %}
+{% else %}
+  {% set active_page = "custom_domain" %}
+{% endif %}
 
 {% block default_content %}
   <div class="row">
diff --git a/templates/emails/transactional/trial-end.txt b/templates/emails/transactional/trial-end.txt.jinja2
similarity index 100%
rename from templates/emails/transactional/trial-end.txt
rename to templates/emails/transactional/trial-end.txt.jinja2