issue #810 - Fixing removal / creation of groups

Same as before, rebased onto 14.01