Cleaned up admin form ID handling