From 15c3abe03c37f657f73612b5c27436cc9407d32e Mon Sep 17 00:00:00 2001
From: Alya Abbott <alya@zulip.com>
Date: Mon, 16 Oct 2023 15:47:21 -0700
Subject: [PATCH] emails: Suggest resetting password if having trouble logging
 in.

Tweaked by tabbott to not include the URL in the translation tags.
---
 help/include/change-password-via-email-confirmation.md | 2 +-
 templates/zerver/emails/find_team.html                 | 6 +++++-
 templates/zerver/emails/find_team.txt                  | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/help/include/change-password-via-email-confirmation.md b/help/include/change-password-via-email-confirmation.md
index b75416b0d3..73adc0f89b 100644
--- a/help/include/change-password-via-email-confirmation.md
+++ b/help/include/change-password-via-email-confirmation.md
@@ -2,7 +2,7 @@
 
 1. If you are logged in, start by [logging out](/help/logging-out).
 
-2. Go to your organization's log in page at `https://<organization-url>/login/`.
+2. Go to your organization's login page at `https://<organization-url>/login/`.
 
 3. Click the **Forgot your password?** link below the **Log in** button or
    buttons.
diff --git a/templates/zerver/emails/find_team.html b/templates/zerver/emails/find_team.html
index 6544b176be..9160aeff77 100644
--- a/templates/zerver/emails/find_team.html
+++ b/templates/zerver/emails/find_team.html
@@ -15,7 +15,11 @@
     {% endfor %}
 </ul>
 
-<p>{% trans %}If you have trouble logging in, please contact Zulip support by replying to this email.{% endtrans %}</p>
+<p>
+    {% trans help_url="https://zulip.com/help/change-your-password#if-youve-forgotten-or-never-had-a-password" %}
+    If you have trouble logging in, you can <a href="{{ help_url }}">reset your password</a>.
+    {% endtrans %}
+</p>
 
 <p>{{ _("Thanks for using Zulip!") }}</p>
 {% endblock %}
diff --git a/templates/zerver/emails/find_team.txt b/templates/zerver/emails/find_team.txt
index bb5540cae4..a364cf8d48 100644
--- a/templates/zerver/emails/find_team.txt
+++ b/templates/zerver/emails/find_team.txt
@@ -9,7 +9,8 @@ Your email address {{ email }} has accounts with the following Zulip organizatio
 * {{ realm.name }}: {{ realm.uri }}
 {% endfor %}
 
-{% trans %}If you have trouble logging in, please contact Zulip support by replying to this email.{% endtrans %}
-
+{% trans help_url="https://zulip.com/help/change-your-password#if-youve-forgotten-or-never-had-a-password" %}
+If you have trouble logging in, you can reset your password ({{ help_url }}).
+{% endtrans %}
 
 {{ _("Thanks for using Zulip!") }}