admin-ui: Fix JS bug
Merge branch 'feature-admin-ui-demo' into feature-admin