fixed a few issues with the admin states