diff --git a/components/missions/missions-admin-panel.tsx b/components/missions/missions-admin-panel.tsx
index b106a836..3ead1381 100644
--- a/components/missions/missions-admin-panel.tsx
+++ b/components/missions/missions-admin-panel.tsx
@@ -919,6 +919,11 @@ export function MissionsAdminPanel() {
                               const user = users.find(u => u.id === gardienDuTemps);
                               return user ? (
                                 <div className="flex items-center">
+                                  <div className="h-10 w-10 rounded-full bg-gray-100 flex items-center justify-center text-gray-600 font-medium mr-3">
+                                    {user.firstName?.[0] || ""}{user.lastName?.[0] || ""}
+                                  </div>
+                                  <div>
+                                    <div className="font-medium text-gray-900">{user.firstName} {user.lastName}</div>
                                   <div className="h-10 w-10 rounded-full bg-blue-100 flex items-center justify-center text-blue-600 font-medium mr-3">
                                     {user.firstName?.[0] || ""}{user.lastName?.[0] || ""}
                                   </div>
@@ -1155,84 +1160,85 @@ export function MissionsAdminPanel() {
                                     <div>
                                       <div className="font-medium text-gray-900">{user.firstName} {user.lastName}</div>
                                       <div className="text-sm text-gray-500">{user.email}</div>
+                                      {isUserAssigned(user.id) && (
+                                        <div className="flex flex-wrap gap-1 mt-1">
+                                          {getUserRoles(user.id).map((role) => (
+                                            <Badge 
+                                              key={role}
+                                              className={`px-1.5 py-0.5 text-xs ${
+                                                role === 'volontaire' 
+                                                  ? 'bg-gray-100 text-gray-800' 
+                                                  : 'bg-blue-100 text-blue-800'
+                                              }`}
+                                            >
+                                              {getRoleDisplayName(role)}
+                                            </Badge>
+                                          ))}
+                                        </div>
+                                      )}
                                     </div>
                                   </div>
                                   
-                                  {/* User role controls */}
-                                  {isUserAssigned(user.id) ? (
-                                    <div className="flex items-center">
-                                      <div className="flex flex-wrap gap-1 mr-2">
-                                        {getUserRoles(user.id).map((role) => (
-                                          <Badge 
-                                            key={role}
-                                            className={`px-2 py-1 ${
-                                              role === 'volontaire' 
-                                                ? 'bg-gray-100 text-gray-800 hover:bg-gray-200' 
-                                                : 'bg-blue-100 text-blue-800 hover:bg-blue-200'
-                                            }`}
-                                          >
-                                            {getRoleDisplayName(role)}
-                                          </Badge>
-                                        ))}
-                                      </div>
+                                  {/* User role controls always show dropdown */}
+                                  <div className="flex items-center">
+                                    <DropdownMenu>
+                                      <DropdownMenuTrigger asChild>
+                                        <Button 
+                                          variant="outline" 
+                                          size="sm"
+                                          className="text-blue-600 bg-white hover:bg-blue-50 hover:text-blue-700 border-blue-200 h-8 mr-2"
+                                          disabled={loading}
+                                        >
+                                          <UserPlus size={16} className="mr-1" />
+                                          {isUserAssigned(user.id) ? "Ajouter rôle" : "Enregistrer"}
+                                        </Button>
+                                      </DropdownMenuTrigger>
+                                      <DropdownMenuContent align="end" className="bg-white border border-gray-200">
+                                        <DropdownMenuItem 
+                                          onClick={() => assignGuardienRole(user.id, 'temps')}
+                                          className="cursor-pointer"
+                                        >
+                                          Gardien du Temps
+                                        </DropdownMenuItem>
+                                        <DropdownMenuItem 
+                                          onClick={() => assignGuardienRole(user.id, 'parole')}
+                                          className="cursor-pointer"
+                                        >
+                                          Gardien de la Parole
+                                        </DropdownMenuItem>
+                                        <DropdownMenuItem 
+                                          onClick={() => assignGuardienRole(user.id, 'memoire')}
+                                          className="cursor-pointer"
+                                        >
+                                          Gardien de la Mémoire
+                                        </DropdownMenuItem>
+                                      </DropdownMenuContent>
+                                    </DropdownMenu>
+                                    
+                                    <Button 
+                                      variant="outline" 
+                                      size="sm" 
+                                      onClick={() => assignVolontaire(user.id)}
+                                      className="text-gray-700 bg-white hover:bg-gray-50 border-gray-300 h-8"
+                                      disabled={loading}
+                                    >
+                                      <PlusCircle size={16} className="mr-1" />
+                                      Volontaire
+                                    </Button>
+                                    
+                                    {isUserAssigned(user.id) && (
                                       <Button 
                                         variant="outline" 
                                         size="sm" 
                                         onClick={() => removeUserFromAllRoles(user.id)}
-                                        className="text-red-600 hover:bg-red-50 hover:text-red-700 border-red-200 h-7 px-2"
+                                        className="ml-2 text-red-600 hover:bg-red-50 hover:text-red-700 border-red-200 h-8"
                                         disabled={loading}
                                       >
-                                        <X size={14} />
+                                        <X size={14} className="mr-1" />
+                                        Supprimer
                                       </Button>
-                                    </div>
-                                  ) : (
-                                    <div className="flex">
-                                      <DropdownMenu>
-                                        <DropdownMenuTrigger asChild>
-                                          <Button 
-                                            variant="outline" 
-                                            size="sm"
-                                            className="text-blue-600 bg-white hover:bg-blue-50 hover:text-blue-700 border-blue-200 h-8 mr-2"
-                                            disabled={loading}
-                                          >
-                                            <UserPlus size={16} className="mr-1" />
-                                            Enregistrer
-                                          </Button>
-                                        </DropdownMenuTrigger>
-                                        <DropdownMenuContent align="end" className="bg-white border border-gray-200">
-                                          <DropdownMenuItem 
-                                            onClick={() => assignGuardienRole(user.id, 'temps')}
-                                            className="cursor-pointer"
-                                          >
-                                            Gardien du Temps
-                                          </DropdownMenuItem>
-                                          <DropdownMenuItem 
-                                            onClick={() => assignGuardienRole(user.id, 'parole')}
-                                            className="cursor-pointer"
-                                          >
-                                            Gardien de la Parole
-                                          </DropdownMenuItem>
-                                          <DropdownMenuItem 
-                                            onClick={() => assignGuardienRole(user.id, 'memoire')}
-                                            className="cursor-pointer"
-                                          >
-                                            Gardien de la Mémoire
-                                          </DropdownMenuItem>
-                                        </DropdownMenuContent>
-                                      </DropdownMenu>
-                                      
-                                      <Button 
-                                        variant="outline" 
-                                        size="sm" 
-                                        onClick={() => assignVolontaire(user.id)}
-                                        className="text-gray-700 bg-white hover:bg-gray-50 border-gray-300 h-8"
-                                        disabled={loading}
-                                      >
-                                        <PlusCircle size={16} className="mr-1" />
-                                        Volontaire
-                                      </Button>
-                                    </div>
-                                  )}
+                                    )}
+                                  </div>
                                 </div>
                               ))}
                             </div>