ESSENTIALS-258: Adjusted UI to avoid problem case.
Merge branch 'master' of github.com:onehippo/essentials