Ticket #970: Bugfix on admin UI, part 2