FIx validation and admin