solve the admin tab issue in a more generic way
7 files changed