Fix for admin UI