Incorporated changes to user and group settings