Add admin check for admin list and remove timeout