Fixes some problems with the AdminDialog introduced by another PR
Made use of CollectionUtils
Merge pull request #2577 from dominikl/rebased/develop/group_security_violation

Fixed issues with AdminDialog (rebased onto develop)