#24 Fix AdminPanel