Fixes #6538 - User group vs usergroup name consistency