BOOK-719, fixing admin and log wip