Allow admin_code to be passed along when using an "entity" type.
Merge branch 'fix/too-many-admin-registered'