Add fixes for when usersuffix and groupsuffix are blank.