diff --git a/src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java b/src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java
index abf831e..087759f 100644
--- a/src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java
+++ b/src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java
@@ -298,7 +298,7 @@ public class AffiliationService {
                                                 Cordialement,
                                                 L'équipe de la FFSAF
                                                 """, club.getName(), club.getNo_affiliation())
-                        ).setFrom("no-reply@ffsaf.fr").setReplyTo("contact@ffsaf.fr").addTo(form.getM2_email(), form.getM3_email())
+                        ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("contact@ffsaf.fr").addTo(form.getM2_email(), form.getM3_email())
                 ));
     }
 
diff --git a/src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java b/src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java
index 641f28f..69cbf8a 100644
--- a/src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java
+++ b/src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java
@@ -122,7 +122,7 @@ public class KeycloakService {
             UserRepresentation user2 = user.toRepresentation();
             String oldEmail = user2.getEmail();
             if (email.equals(user2.getEmail()))
-                return "";
+                return null;
             user2.setEmail(email);
             user2.setRequiredActions(List.of(RequiredAction.VERIFY_EMAIL.name()));
             user.update(user2);
@@ -148,7 +148,7 @@ public class KeycloakService {
                                                 Cordialement,
                                                 L'équipe de la FFSAF
                                                 """, oldEmail, email)
-                        ).setFrom("no-reply@ffsaf.fr").setReplyTo("support@ffsaf.fr")
+                        ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("support@ffsaf.fr")
                 ));
     }
 
@@ -275,7 +275,7 @@ public class KeycloakService {
                                                 Cordialement,
                                                 L'équipe de la FFSAF
                                                 """, user.getUsername())
-                        ).setFrom("no-reply@ffsaf.fr").setReplyTo("support@ffsaf.fr")
+                        ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("support@ffsaf.fr")
                 ) : Uni.createFrom().nullItem())
                 .call(user -> membreService.setUserId(membreModel.getId(), user.getId()))
                 .call(user -> setClubGroupMembre(membreModel, membreModel.getClub()));