Fixes on generate_admin