Small additional fix to admin UI regression
Merge branch 'admin-ui-fixes'

* admin-ui-fixes:
  Small additional fix to admin UI regression