changes to enable some fields only for admin use