diff --git a/README.md b/README.md
index b7aa28882..a052bcfbe 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Geocity - build your (geo)-forms easily! ![Geocity CI](https://github.com/yverdon/geocity/workflows/Geocity%20CI/badge.svg?branch=main)
 
-**[What is Geocity ?](https://geocity.ch/about)**
+**[What is Geocity ?](https://geocity-asso.ch)**
 
 **[Features and user guide](https://github.com/yverdon/geocity/wiki)**
 
diff --git a/geocity/apps/accounts/templates/account/lockout.html b/geocity/apps/accounts/templates/account/lockout.html
index 1a614c9d4..f19db393b 100644
--- a/geocity/apps/accounts/templates/account/lockout.html
+++ b/geocity/apps/accounts/templates/account/lockout.html
@@ -25,7 +25,7 @@ <h3>{% translate "Votre compte a été verrouillé par mesure de sécurité. Mer
         <small>
           &copy; {% now "Y" %} Geocity
           &nbsp;|&nbsp;
-          <a href="https://geocity.ch/about" target="_blank" rel="noreferrer">{% translate "A propos" %}</a>
+          <a href="https://geocity-asso.ch" target="_blank" rel="noreferrer">{% translate "A propos" %}</a>
           {% if config.CONTACT_URL %}
             &nbsp;|&nbsp;
             <a href="{{ config.CONTACT_URL }}" target="_blank" rel="noreferrer">{% translate "Contact" %}</a>
diff --git a/geocity/apps/core/templates/base_generic.html b/geocity/apps/core/templates/base_generic.html
index b9802b7ac..9c7e841c1 100644
--- a/geocity/apps/core/templates/base_generic.html
+++ b/geocity/apps/core/templates/base_generic.html
@@ -206,7 +206,7 @@
           <small>
             &copy; {% now "Y" %} Geocity
             &nbsp;|&nbsp;
-            <a href="https://geocity.ch/about" target="_blank" rel="noreferrer">{% translate "A propos" %}</a>
+            <a href="https://geocity-asso.ch" target="_blank" rel="noreferrer">{% translate "A propos" %}</a>
             {% if config.CONTACT_URL %}
               &nbsp;|&nbsp;
               <a href="{{ config.CONTACT_URL }}" target="_blank" rel="noreferrer">{% translate "Contact" %}</a>
diff --git a/geocity/apps/submissions/services.py b/geocity/apps/submissions/services.py
index 11fb96bd7..7c5dda7e7 100644
--- a/geocity/apps/submissions/services.py
+++ b/geocity/apps/submissions/services.py
@@ -1,6 +1,7 @@
 import tempfile
 import zipfile
 from datetime import datetime
+from email.header import Header
 
 import filetype
 from constance import config
@@ -168,7 +169,7 @@ def send_validation_reminder(submission, absolute_uri_func):
 
 def send_email_notification(data, attachments=None):
     from_email_name = (
-        f'{data["submission"].administrative_entity.expeditor_name} '
+        f'{Header(data["submission"].administrative_entity.expeditor_name, "utf-8").encode()} '
         if data["submission"].administrative_entity.expeditor_name
         else ""
     )
diff --git a/geocity/tests/submissions/test_a_permit_request.py b/geocity/tests/submissions/test_a_permit_request.py
index 84b284720..a6bde5740 100644
--- a/geocity/tests/submissions/test_a_permit_request.py
+++ b/geocity/tests/submissions/test_a_permit_request.py
@@ -2,6 +2,7 @@
 import datetime
 import re
 from datetime import date
+from email.header import Header
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -2952,11 +2953,13 @@ def test_secretary_email_and_name_are_set_for_the_administrative_entity(self):
             follow=True,
         )
 
+        from_email = (
+            f'{Header("Geocity Rocks", "utf-8").encode()} <geocity_rocks@geocity.ch>'
+        )
+
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(mail.outbox), 1)
-        self.assertEqual(
-            mail.outbox[0].from_email, "Geocity Rocks <geocity_rocks@geocity.ch>"
-        )
+        self.assertEqual(mail.outbox[0].from_email, from_email)
         self.assertEqual(
             mail.outbox[0].subject,
             "{} ({})".format(