Ticket #970: Bugfix on admin UI