Adjust new admin handling: simpler is_admin?, add fkey