diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index becf46d5b..2cd3e5a5c 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -49,11 +49,11 @@
{% if domain.get_state_help_text %}
- {% if has_domain_renewal_flag and domain.is_expiring and is_domain_manager %}
+ {% if has_domain_renewal_flag and domain.is_expired and is_domain_manager %}
This domain has expired, but it is still online.
{% url 'domain-renewal' pk=domain.id as url %}
Renew to maintain access.
- {% elif has_domain_renewal_flag and domain.is_expired and is_domain_manager %}
+ {% elif has_domain_renewal_flag and domain.is_expiring and is_domain_manager %}
This domain will expire soon.
{% url 'domain-renewal' pk=domain.id as url %}
Renew to maintain access.
diff --git a/src/registrar/templates/domain_renewal.html b/src/registrar/templates/domain_renewal.html
index 7867bfce8..e90e4a366 100644
--- a/src/registrar/templates/domain_renewal.html
+++ b/src/registrar/templates/domain_renewal.html
@@ -49,10 +49,8 @@
{% url 'user-profile' as url %}
- {% include "includes/summary_item.html" with title='Your Contact Information' value=user edit_link=url editable=is_editable contact='true' %}
+ {% include "includes/summary_item.html" with title='Your contact information' value=user edit_link=url editable=is_editable contact='true' %}
-
-
{% if analyst_action != 'edit' or analyst_action_location != domain.pk %}
{% if is_portfolio_user and not is_domain_manager %}
@@ -65,6 +63,7 @@
{% endif %}
{% endif %}
+
{% url 'domain-security-email' pk=domain.id as url %}
{% if security_email is not None and security_email not in hidden_security_emails%}
{% include "includes/summary_item.html" with title='Security email' value=security_email custom_text_for_value_none='We strongly recommend that you provide a security email. This email will allow the public to report observed or suspected security issues on your domain.' edit_link=url editable=is_editable %}
@@ -78,7 +77,6 @@
{% include "includes/summary_item.html" with title='Domain managers' list=True users=True value=domain.permissions.all edit_link=url editable=is_editable %}
{% endif %}
-
- {% if has_domain_renewal_flag and num_expiring_domains > 0 %}
+ {% if has_domain_renewal_flag %}
{% endif %}
{% else %}
-
{% if custom_text_for_value_none %}
{{ custom_text_for_value_none }}
{% endif %}
{% if value %}
{{ value }}
{% endif %}
- {% if not value and not custom_text_for_value_none %}
+ {% if not value %}
None
{% endif %}