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

Fixed issues with AdminDialog