Cleaning up the admin users code