diff --git a/templates/dashboard/support.html b/templates/dashboard/support.html
index d51f697e..0d18ae85 100644
--- a/templates/dashboard/support.html
+++ b/templates/dashboard/support.html
@@ -18,7 +18,7 @@
For generic questions, i.e. not related to your account, we recommend to post the question on
our
- Reddit or our official forum
+ Reddit or forum
where our community can help answer the question
and other people with the same question can find the answer there.
diff --git a/templates/emails/com/onboarding/welcome-proton-user.html b/templates/emails/com/onboarding/welcome-proton-user.html
index b14e7c33..7da30691 100644
--- a/templates/emails/com/onboarding/welcome-proton-user.html
+++ b/templates/emails/com/onboarding/welcome-proton-user.html
@@ -43,8 +43,7 @@ Note, if you are a paying Proton Mail user, you automatically receive the premiu
{% endcall %}
{% call text() %}
-For any question or feedback, please join our official forum.
-If you want to request a feature, please submit it on our GitHub repo.
+For any question or if you want to request a feature, please submit it on our forum.
You can also join our
Reddit
or follow our
diff --git a/templates/emails/com/onboarding/welcome-proton-user.txt.jinja2 b/templates/emails/com/onboarding/welcome-proton-user.txt.jinja2
index c10a7837..07e621dd 100644
--- a/templates/emails/com/onboarding/welcome-proton-user.txt.jinja2
+++ b/templates/emails/com/onboarding/welcome-proton-user.txt.jinja2
@@ -27,8 +27,7 @@ Firefox: https://addons.mozilla.org/firefox/addon/simplelogin/
Edge: https://microsoftedge.microsoft.com/addons/detail/simpleloginreceive-sen/diacfpipniklenphgljfkmhinphjlfff
Android: https://play.google.com/store/apps/details?id=io.simplelogin.android
iOS: https://apps.apple.com/app/id1494359858
-Github repo: https://github.com/simple-login/app/discussions
-Official forum: https://forum.simplelogin.io/
+Forum: https://github.com/simple-login/app/discussions
Reddit: https://www.reddit.com/r/Simplelogin/
Twitter: https://twitter.com/simple_login
diff --git a/templates/emails/com/welcome.html b/templates/emails/com/welcome.html
index c298db54..73707b76 100644
--- a/templates/emails/com/welcome.html
+++ b/templates/emails/com/welcome.html
@@ -71,10 +71,8 @@ Please note that you can't create more than {{ MAX_NB_EMAIL_FREE_PLAN }} aliases
{% endif %}
{% call text() %}
-For any question or feedback,
-please join our official forum.
-If you want to request a feature,
-please submit it on our GitHub repo.
+For any question or if you want to request a feature,
+please submit it on our forum.
You can also join our
Reddit
or follow our
diff --git a/templates/emails/com/welcome.txt b/templates/emails/com/welcome.txt
index fd4c8ebb..82e6cb28 100644
--- a/templates/emails/com/welcome.txt
+++ b/templates/emails/com/welcome.txt
@@ -26,8 +26,6 @@ No worries: all aliases you create during this period will continue to work norm
At any time, you can reach out to us by simply replying to this email.
-For any question or feedback, please join our official forum at https://forum.simplelogin.io/
-
-If you want to request a feature, please submit it on our GitHub repo at https://github.com/simple-login/app/discussions
+For any question or if you want to request a feature, please submit it on our forum at https://github.com/simple-login/app/discussions
You can also join our Reddit at https://www.reddit.com/r/Simplelogin/ follow our Twitter at https://twitter.com/simplelogin
diff --git a/templates/footer.html b/templates/footer.html
index 0aa7c338..21753c33 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -93,7 +93,7 @@
+ href="https://github.com/simple-login/app/discussions">Forum
diff --git a/templates/header.html b/templates/header.html
index 4920c896..f6d72eb3 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -91,7 +91,7 @@