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 a87c2e5..f5966b9 100644
--- a/src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java
+++ b/src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java
@@ -86,17 +86,26 @@ public class KeycloakService {
     }
 
     public Uni<String> setClubGroupMembre(MembreModel membreModel, ClubModel club) {
-        return getGroupFromClub(club).chain(
-                clubId -> getUserFromMember(membreModel).chain(
-                        userId -> vertx.getOrCreateContext().executeBlocking(() -> {
-                            UserResource user = keycloak.realm(realm).users().get(userId);
-                            user.groups().stream().filter(g -> g.getPath().startsWith("/club"))
-                                    .forEach(g -> user.leaveGroup(g.getId()));
-                            user.joinGroup(clubId);
-                            LOGGER.infof("Set club \"%s\" to user %s (%s)", club.getName(), userId,
-                                    user.toRepresentation().getUsername());
-                            return "OK";
-                        })));
+        if (club == null)
+            return getUserFromMember(membreModel).chain(
+                    userId -> vertx.getOrCreateContext().executeBlocking(() -> {
+                        UserResource user = keycloak.realm(realm).users().get(userId);
+                        user.groups().stream().filter(g -> g.getPath().startsWith("/club"))
+                                .forEach(g -> user.leaveGroup(g.getId()));
+                        return "OK";
+                    }));
+        else
+            return getGroupFromClub(club).chain(
+                    clubId -> getUserFromMember(membreModel).chain(
+                            userId -> vertx.getOrCreateContext().executeBlocking(() -> {
+                                UserResource user = keycloak.realm(realm).users().get(userId);
+                                user.groups().stream().filter(g -> g.getPath().startsWith("/club"))
+                                        .forEach(g -> user.leaveGroup(g.getId()));
+                                user.joinGroup(clubId);
+                                LOGGER.infof("Set club \"%s\" to user %s (%s)", club.getName(), userId,
+                                        user.toRepresentation().getUsername());
+                                return "OK";
+                            })));
     }
 
     public Uni<?> setEmail(String userId, String email) {