Update admin.c from Etape2 with Etape1 changes